Skip to content

Commit 8d85996

Browse files
Merge pull request #1070 from terraform-providers/release_gh
Release gh
2 parents e4ec36f + 326ba5a commit 8d85996

File tree

79 files changed

+2535
-108
lines changed

Some content is hidden

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

79 files changed

+2535
-108
lines changed

CHANGELOG.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,17 @@
11
## 3.76.0 (Unreleased)
2+
3+
### Added
4+
- Support resource discovery for autoScaling resources
5+
- Support for exposing `private_endpoint` in `oci_database_autonomous_database`
6+
- Support for JWT Validation in API Gateway Service
7+
- Support for `os_family` attribute in `oci_osmanagement_managed_instance_group` resource
8+
- Support for `os_family` and `is_reboot_required` attributes in `oci_osmanagement_managed_instance` datasource
9+
- Support for oci core image datasource
10+
- Support resource discovery for `containerengine` service
11+
12+
### Fixed
13+
- Fixed the delegation support in resource `oci_file_storage_mount_target`
14+
215
## 3.75.0 (May 13, 2020)
316

417
### Added
File renamed without changes.
Lines changed: 127 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,127 @@
1+
// Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
2+
3+
variable "tenancy_ocid" {}
4+
variable "user_ocid" {}
5+
variable "fingerprint" {}
6+
variable "private_key_path" {}
7+
variable "region" {}
8+
variable "compartment_ocid" {}
9+
10+
provider "oci" {
11+
tenancy_ocid = "${var.tenancy_ocid}"
12+
user_ocid = "${var.user_ocid}"
13+
fingerprint = "${var.fingerprint}"
14+
private_key_path = "${var.private_key_path}"
15+
region = "${var.region}"
16+
}
17+
18+
resource "oci_core_vcn" "vcn1" {
19+
cidr_block = "10.0.0.0/16"
20+
compartment_id = "${var.compartment_ocid}"
21+
display_name = "exampleVCN"
22+
dns_label = "tfexamplevcn"
23+
}
24+
25+
resource "oci_core_subnet" "regional_subnet" {
26+
cidr_block = "10.0.1.0/24"
27+
display_name = "regionalSubnet"
28+
dns_label = "regionalsubnet"
29+
compartment_id = "${var.compartment_ocid}"
30+
vcn_id = "${oci_core_vcn.vcn1.id}"
31+
}
32+
33+
resource "oci_apigateway_gateway" "test_gateway" {
34+
compartment_id = "${var.compartment_ocid}"
35+
endpoint_type = "PUBLIC"
36+
subnet_id = "${oci_core_subnet.regional_subnet.id}"
37+
}
38+
39+
resource "oci_apigateway_deployment" "test_deployment" {
40+
compartment_id = "${var.compartment_ocid}"
41+
gateway_id = "${oci_apigateway_gateway.test_gateway.id}"
42+
path_prefix = "/v1"
43+
44+
specification {
45+
logging_policies {
46+
access_log {
47+
is_enabled = "false"
48+
}
49+
50+
execution_log {
51+
is_enabled = "false"
52+
log_level = "INFO"
53+
}
54+
}
55+
56+
request_policies {
57+
authentication {
58+
type = "JWT_AUTHENTICATION"
59+
token_header = "Authorization"
60+
token_auth_scheme = "Bearer"
61+
is_anonymous_access_allowed = "false"
62+
issuers = ["https://identity.oraclecloud.com/"]
63+
audiences = ["https://www.oracle.com/"]
64+
max_clock_skew_in_seconds = "10"
65+
66+
public_keys {
67+
type = "REMOTE_JWKS"
68+
max_cache_duration_in_hours = "10"
69+
uri = "https://oracle.com/jwks.json"
70+
}
71+
}
72+
73+
cors {
74+
allowed_origins = ["*"]
75+
allowed_methods = ["GET"]
76+
}
77+
78+
rate_limiting {
79+
rate_in_requests_per_second = "10"
80+
rate_key = "CLIENT_IP"
81+
}
82+
}
83+
84+
routes {
85+
backend {
86+
type = "HTTP_BACKEND"
87+
url = "https://api.weather.gov"
88+
}
89+
90+
path = "/hello"
91+
methods = ["GET"]
92+
93+
logging_policies {
94+
access_log {
95+
is_enabled = "false"
96+
}
97+
98+
execution_log {
99+
is_enabled = "false"
100+
log_level = "INFO"
101+
}
102+
}
103+
104+
request_policies {
105+
authorization {
106+
type = "AUTHENTICATION_ONLY"
107+
}
108+
109+
cors {
110+
allowed_headers = ["*"]
111+
allowed_methods = ["GET"]
112+
allowed_origins = ["*"]
113+
}
114+
}
115+
}
116+
}
117+
118+
display_name = "test_api_gateway_deployment"
119+
}
120+
121+
data "oci_apigateway_gateways" "test_gateways" {
122+
compartment_id = "${var.compartment_ocid}"
123+
}
124+
125+
data "oci_apigateway_deployments" "test_deployments" {
126+
compartment_id = "${var.compartment_ocid}"
127+
}

examples/compute/image/image.tf

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,11 @@ data "oci_core_images" "supported_shape_images" {
133133
#sort_order = "DESC"
134134
}
135135

136+
# Another way to get the custom image that will be created by this Terraform config
137+
data "oci_core_image" "supported_image" {
138+
image_id = "${oci_core_image.custom_image.id}"
139+
}
140+
136141
output "supported_shape_images" {
137142
value = "${data.oci_core_images.supported_shape_images.images}"
138143
}

examples/networking/ipsec_connections/ipsec_connection.tf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ resource "oci_core_ipsec_connection_tunnel_management" "test_ipsec_connection_tu
8484
display_name = "MyIPSecConnection"
8585
routing = "BGP"
8686
shared_secret = "sharedSecret"
87+
ike_version = "V1"
8788
}
8889

8990
resource "oci_identity_tag_namespace" "tag_namespace1" {

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ require (
77
github.com/hashicorp/hcl2 v0.0.0-20190618163856-0b64543c968c
88
github.com/hashicorp/terraform v0.12.4-0.20190628193153-a74738cd35fc
99
github.com/mitchellh/cli v1.0.0
10-
github.com/oracle/oci-go-sdk v19.2.0+incompatible
10+
github.com/oracle/oci-go-sdk v19.3.0+incompatible
1111
github.com/stretchr/objx v0.1.1 // indirect
1212
github.com/stretchr/testify v1.3.0
1313
gopkg.in/yaml.v2 v2.2.2

go.sum

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,6 @@ github.com/joyent/triton-go v0.0.0-20180313100802-d8f9c0314926 h1:kie3qOosvRKqwi
333333
github.com/joyent/triton-go v0.0.0-20180313100802-d8f9c0314926/go.mod h1:U+RSyWxWd04xTqnuOQxnai7XGS2PrPY2cfGoDKtMHjA=
334334
github.com/json-iterator/go v1.1.5 h1:gL2yXlmiIo4+t+y32d4WGwOjKGYcGOuyrg46vadswDE=
335335
github.com/json-iterator/go v1.1.5/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
336-
github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
337336
github.com/jtolds/gls v4.2.1+incompatible h1:fSuqC+Gmlu6l/ZYAoZzx2pyucC8Xza35fpRVWLVmUEE=
338337
github.com/jtolds/gls v4.2.1+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
339338
github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
@@ -446,6 +445,8 @@ github.com/oracle/oci-go-sdk v19.1.0+incompatible h1:UUt6LBPlbn+OnNMBxiHWzlwqSgM
446445
github.com/oracle/oci-go-sdk v19.1.0+incompatible/go.mod h1:VQb79nF8Z2cwLkLS35ukwStZIg5F66tcBccjip/j888=
447446
github.com/oracle/oci-go-sdk v19.2.0+incompatible h1:BHsuizamIbAk6RJP1q36ygdIUgBLyjAKW9P5XSSDYdU=
448447
github.com/oracle/oci-go-sdk v19.2.0+incompatible/go.mod h1:VQb79nF8Z2cwLkLS35ukwStZIg5F66tcBccjip/j888=
448+
github.com/oracle/oci-go-sdk v19.3.0+incompatible h1:gslDF/UZ5bXLh3oZoEyCPolOMS3Oc+I68hcwXwpyE1c=
449+
github.com/oracle/oci-go-sdk v19.3.0+incompatible/go.mod h1:VQb79nF8Z2cwLkLS35ukwStZIg5F66tcBccjip/j888=
449450
github.com/packer-community/winrmcp v0.0.0-20180102160824-81144009af58 h1:m3CEgv3ah1Rhy82L+c0QG/U3VyY1UsvsIdkh0/rU97Y=
450451
github.com/packer-community/winrmcp v0.0.0-20180102160824-81144009af58/go.mod h1:f6Izs6JvFTdnRbziASagjZ2vmf55NSIkC/weStxCHqk=
451452
github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c h1:Lgl0gzECD8GnQ5QCWA8o6BtfL6mDH5rQgM4/fX3avOs=

0 commit comments

Comments
 (0)