Skip to content

Commit 3fc1679

Browse files
jotruonjotruon
authored
Candidate for release_v4.1.0
Candidate for release_v4.1.0
2 parents e84e172 + e9b28bd commit 3fc1679

File tree

120 files changed

+3366
-102
lines changed

Some content is hidden

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

120 files changed

+3366
-102
lines changed

‎CHANGELOG.md‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
## 4.1.0 (Unreleased)
2+
3+
### Added
4+
- Support for reading OBO token from local file
5+
- Support for Oracle Key Vault with ExaCC
6+
7+
### Fixed
8+
- Fix an issue where identity user resource panics if an invalid API key configuration is given
9+
- Allow `~` home directories to be specified in private_key_path of provider oci blocks
10+
111
## 4.0.0 (October 21, 2020)
212

313
### Added

‎examples/database/dataguard/existing_vm_cluster/dataguard.tf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ resource "oci_database_vm_cluster_network" "test_vm_cluster_network" {
118118
vm_networks {
119119
domain_name = "oracle.com"
120120
gateway = "192.169.20.2"
121-
netmask = "255.255.0.1"
121+
netmask = "255.255.192.0"
122122
network_type = "BACKUP"
123123

124124
nodes {
@@ -137,7 +137,7 @@ resource "oci_database_vm_cluster_network" "test_vm_cluster_network" {
137137
vm_networks {
138138
domain_name = "oracle.com"
139139
gateway = "192.168.20.2"
140-
netmask = "255.255.0.1"
140+
netmask = "255.255.192.0"
141141
network_type = "CLIENT"
142142

143143
nodes {

‎examples/database/exadata_cc/autonomous_vm_cluster.tf‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,21 @@ data "oci_database_autonomous_vm_clusters" "test_autonomous_vm_clusters" {
3030
state = "AVAILABLE"
3131
}
3232

33+
variable "vault_id" {
34+
}
35+
36+
variable "secret_id" {
37+
}
38+
39+
resource "oci_database_key_store" "test_key_store" {
40+
compartment_id = var.compartment_ocid
41+
display_name = "Key Store"
42+
type_details {
43+
admin_username = "username1"
44+
connection_ips = ["192.1.1.1", "192.1.1.2"]
45+
secret_id = var.secret_id
46+
type = "ORACLE_KEY_VAULT"
47+
vault_id = var.vault_id
48+
}
49+
}
50+

‎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/v27 v27.1.0
9+
github.com/oracle/oci-go-sdk/v27 v27.2.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/v27 v27.1.0 h1:e/ib4GeJ8k6TNfgDXaAE2m9rlgdBV9qAN3e5+u8xsBE=
204-
github.com/oracle/oci-go-sdk/v27 v27.1.0/go.mod h1:TeoXZiKSPNKbPqxykLnSLkdPXK9mY9cR6HIkBJVyi34=
203+
github.com/oracle/oci-go-sdk/v27 v27.2.0 h1:FifaAZc7cntZ483WEVswdV5rB8hByF4nM9yc2QzHBzo=
204+
github.com/oracle/oci-go-sdk/v27 v27.2.0/go.mod h1:TeoXZiKSPNKbPqxykLnSLkdPXK9mY9cR6HIkBJVyi34=
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=

‎oci/analytics_clients.go‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ func init() {
1313
RegisterOracleClient("oci_analytics.AnalyticsClient", &OracleClient{initClientFn: initAnalyticsAnalyticsClient})
1414
}
1515

16-
func initAnalyticsAnalyticsClient(configProvider oci_common.ConfigurationProvider, configureClient ConfigureClient) (interface{}, error) {
16+
func initAnalyticsAnalyticsClient(configProvider oci_common.ConfigurationProvider, configureClient ConfigureClient, serviceClientOverrides ServiceClientOverrides) (interface{}, error) {
1717
client, err := oci_analytics.NewAnalyticsClientWithConfigurationProvider(configProvider)
1818
if err != nil {
1919
return nil, err
@@ -22,6 +22,10 @@ func initAnalyticsAnalyticsClient(configProvider oci_common.ConfigurationProvide
2222
if err != nil {
2323
return nil, err
2424
}
25+
26+
if serviceClientOverrides.hostUrlOverride != "" {
27+
client.Host = serviceClientOverrides.hostUrlOverride
28+
}
2529
return &client, nil
2630
}
2731

‎oci/apigateway_clients.go‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ func init() {
1515
RegisterOracleClient("oci_apigateway.GatewayClient", &OracleClient{initClientFn: initApigatewayGatewayClient})
1616
}
1717

18-
func initApigatewayApiGatewayClient(configProvider oci_common.ConfigurationProvider, configureClient ConfigureClient) (interface{}, error) {
18+
func initApigatewayApiGatewayClient(configProvider oci_common.ConfigurationProvider, configureClient ConfigureClient, serviceClientOverrides ServiceClientOverrides) (interface{}, error) {
1919
client, err := oci_apigateway.NewApiGatewayClientWithConfigurationProvider(configProvider)
2020
if err != nil {
2121
return nil, err
@@ -24,14 +24,18 @@ func initApigatewayApiGatewayClient(configProvider oci_common.ConfigurationProvi
2424
if err != nil {
2525
return nil, err
2626
}
27+
28+
if serviceClientOverrides.hostUrlOverride != "" {
29+
client.Host = serviceClientOverrides.hostUrlOverride
30+
}
2731
return &client, nil
2832
}
2933

3034
func (m *OracleClients) apiGatewayClient() *oci_apigateway.ApiGatewayClient {
3135
return m.GetClient("oci_apigateway.ApiGatewayClient").(*oci_apigateway.ApiGatewayClient)
3236
}
3337

34-
func initApigatewayDeploymentClient(configProvider oci_common.ConfigurationProvider, configureClient ConfigureClient) (interface{}, error) {
38+
func initApigatewayDeploymentClient(configProvider oci_common.ConfigurationProvider, configureClient ConfigureClient, serviceClientOverrides ServiceClientOverrides) (interface{}, error) {
3539
client, err := oci_apigateway.NewDeploymentClientWithConfigurationProvider(configProvider)
3640
if err != nil {
3741
return nil, err
@@ -40,14 +44,18 @@ func initApigatewayDeploymentClient(configProvider oci_common.ConfigurationProvi
4044
if err != nil {
4145
return nil, err
4246
}
47+
48+
if serviceClientOverrides.hostUrlOverride != "" {
49+
client.Host = serviceClientOverrides.hostUrlOverride
50+
}
4351
return &client, nil
4452
}
4553

4654
func (m *OracleClients) deploymentClient() *oci_apigateway.DeploymentClient {
4755
return m.GetClient("oci_apigateway.DeploymentClient").(*oci_apigateway.DeploymentClient)
4856
}
4957

50-
func initApigatewayGatewayClient(configProvider oci_common.ConfigurationProvider, configureClient ConfigureClient) (interface{}, error) {
58+
func initApigatewayGatewayClient(configProvider oci_common.ConfigurationProvider, configureClient ConfigureClient, serviceClientOverrides ServiceClientOverrides) (interface{}, error) {
5159
client, err := oci_apigateway.NewGatewayClientWithConfigurationProvider(configProvider)
5260
if err != nil {
5361
return nil, err
@@ -56,6 +64,10 @@ func initApigatewayGatewayClient(configProvider oci_common.ConfigurationProvider
5664
if err != nil {
5765
return nil, err
5866
}
67+
68+
if serviceClientOverrides.hostUrlOverride != "" {
69+
client.Host = serviceClientOverrides.hostUrlOverride
70+
}
5971
return &client, nil
6072
}
6173

‎oci/audit_clients.go‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ func init() {
1313
RegisterOracleClient("oci_audit.AuditClient", &OracleClient{initClientFn: initAuditAuditClient})
1414
}
1515

16-
func initAuditAuditClient(configProvider oci_common.ConfigurationProvider, configureClient ConfigureClient) (interface{}, error) {
16+
func initAuditAuditClient(configProvider oci_common.ConfigurationProvider, configureClient ConfigureClient, serviceClientOverrides ServiceClientOverrides) (interface{}, error) {
1717
client, err := oci_audit.NewAuditClientWithConfigurationProvider(configProvider)
1818
if err != nil {
1919
return nil, err
@@ -22,6 +22,10 @@ func initAuditAuditClient(configProvider oci_common.ConfigurationProvider, confi
2222
if err != nil {
2323
return nil, err
2424
}
25+
26+
if serviceClientOverrides.hostUrlOverride != "" {
27+
client.Host = serviceClientOverrides.hostUrlOverride
28+
}
2529
return &client, nil
2630
}
2731

‎oci/auto_scaling_clients.go‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ func init() {
1313
RegisterOracleClient("oci_auto_scaling.AutoScalingClient", &OracleClient{initClientFn: initAutoscalingAutoScalingClient})
1414
}
1515

16-
func initAutoscalingAutoScalingClient(configProvider oci_common.ConfigurationProvider, configureClient ConfigureClient) (interface{}, error) {
16+
func initAutoscalingAutoScalingClient(configProvider oci_common.ConfigurationProvider, configureClient ConfigureClient, serviceClientOverrides ServiceClientOverrides) (interface{}, error) {
1717
client, err := oci_auto_scaling.NewAutoScalingClientWithConfigurationProvider(configProvider)
1818
if err != nil {
1919
return nil, err
@@ -22,6 +22,10 @@ func initAutoscalingAutoScalingClient(configProvider oci_common.ConfigurationPro
2222
if err != nil {
2323
return nil, err
2424
}
25+
26+
if serviceClientOverrides.hostUrlOverride != "" {
27+
client.Host = serviceClientOverrides.hostUrlOverride
28+
}
2529
return &client, nil
2630
}
2731

‎oci/bds_clients.go‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ func init() {
1313
RegisterOracleClient("oci_bds.BdsClient", &OracleClient{initClientFn: initBdsBdsClient})
1414
}
1515

16-
func initBdsBdsClient(configProvider oci_common.ConfigurationProvider, configureClient ConfigureClient) (interface{}, error) {
16+
func initBdsBdsClient(configProvider oci_common.ConfigurationProvider, configureClient ConfigureClient, serviceClientOverrides ServiceClientOverrides) (interface{}, error) {
1717
client, err := oci_bds.NewBdsClientWithConfigurationProvider(configProvider)
1818
if err != nil {
1919
return nil, err
@@ -22,6 +22,10 @@ func initBdsBdsClient(configProvider oci_common.ConfigurationProvider, configure
2222
if err != nil {
2323
return nil, err
2424
}
25+
26+
if serviceClientOverrides.hostUrlOverride != "" {
27+
client.Host = serviceClientOverrides.hostUrlOverride
28+
}
2529
return &client, nil
2630
}
2731

0 commit comments

Comments
 (0)