Skip to content

Commit 7bfe368

Browse files
MaxrovrMaxrovr
authored
Merge pull request #1666 from oracle/release_gh
Releasing version 4.93.0
2 parents 3199387 + 70e312f commit 7bfe368

File tree

474 files changed

+20997
-12178
lines changed

Some content is hidden

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

474 files changed

+20997
-12178
lines changed

‎CHANGELOG.md‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
## 4.93.0 (September 14, 2022)
2+
3+
### Added
4+
- Support for API Gateway Dynamic Routing
5+
- Support for API Gateway Dynamic Authentication
6+
- Support for API Gateway Request Based Authorization
7+
- Import Export Artifact Datascience
8+
### Bug Fix
9+
- resource discovery deadlocks and improve error handling
10+
111
## 4.92.0 (September 07, 2022)
212

313
### Added

‎coverage/coverage_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414

1515
var totalRgx = regexp.MustCompile(`total:\s+\(statements\)\s+([^"]*)%`)
1616

17-
const CodeCoverageThreshold = 57.5
17+
const CodeCoverageThreshold = 56.1
1818

1919
func TestCoverage(t *testing.T) {
2020
if os.Getenv("CHECK_COVERAGE") != "true" {

‎examples/api_gateway/custom_authentication/main.tf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ variable "deployment_freeform_tags" {
4646
}
4747

4848
variable "application_state" {
49-
default = "AVAILABLE"
49+
default = "ACTIVE"
5050
}
5151

5252
variable "config" {
@@ -302,7 +302,7 @@ data "oci_functions_functions" "test_functions" {
302302
#Optional
303303
display_name = "example-function"
304304
id = oci_functions_function.test_function.id
305-
state = "AVAILABLE"
305+
state = "ACTIVE"
306306
}
307307

308308
resource "oci_apigateway_gateway" "test_gateway" {

‎examples/api_gateway/dynamic_authentication/main.tf‎

Lines changed: 137 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,137 @@
1+
// Copyright (c) 2017, 2021, 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+
variable "user_ocid" {
8+
}
9+
10+
variable "fingerprint" {
11+
}
12+
13+
variable "private_key_path" {
14+
}
15+
16+
variable "region" {
17+
}
18+
19+
variable "compartment_ocid" {
20+
}
21+
22+
variable "gateway_endpoint_type" {
23+
default = "PRIVATE"
24+
}
25+
26+
variable "gateway_state" {
27+
default = "ACTIVE"
28+
}
29+
30+
variable "deployment_state" {
31+
default = "ACTIVE"
32+
}
33+
34+
35+
provider "oci" {
36+
tenancy_ocid = var.tenancy_ocid
37+
user_ocid = var.user_ocid
38+
fingerprint = var.fingerprint
39+
private_key_path = var.private_key_path
40+
region = var.region
41+
}
42+
43+
resource "oci_core_subnet" "regional_subnet" {
44+
cidr_block = "10.0.1.0/24"
45+
display_name = "regionalSubnet"
46+
dns_label = "regionalsubnet"
47+
compartment_id = var.compartment_ocid
48+
vcn_id = oci_core_vcn.vcn1.id
49+
security_list_ids = [oci_core_vcn.vcn1.default_security_list_id]
50+
route_table_id = oci_core_vcn.vcn1.default_route_table_id
51+
dhcp_options_id = oci_core_vcn.vcn1.default_dhcp_options_id
52+
}
53+
54+
data "oci_identity_availability_domain" "ad" {
55+
compartment_id = var.tenancy_ocid
56+
ad_number = 1
57+
}
58+
59+
resource "oci_core_vcn" "vcn1" {
60+
cidr_block = "10.0.0.0/16"
61+
compartment_id = var.compartment_ocid
62+
display_name = "exampleVCN"
63+
dns_label = "tfexamplevcn"
64+
}
65+
66+
resource "oci_apigateway_gateway" "test_gateway" {
67+
#Required
68+
compartment_id = var.compartment_ocid
69+
endpoint_type = var.gateway_endpoint_type
70+
subnet_id = oci_core_subnet.regional_subnet.id
71+
}
72+
73+
resource "oci_apigateway_deployment" "test_deployment" {
74+
#Required
75+
compartment_id = var.compartment_ocid
76+
gateway_id = oci_apigateway_gateway.test_gateway.id
77+
path_prefix = "/v1"
78+
specification {
79+
request_policies {
80+
dynamic_authentication {
81+
selection_source{
82+
type = "SINGLE"
83+
selector = "request.headers[route]"
84+
}
85+
authentication_servers{
86+
key {
87+
type = "ANY_OF"
88+
values = ["test", "def"]
89+
name = "key1"
90+
}
91+
authentication_server_detail {
92+
type = "JWT_AUTHENTICATION"
93+
token_header = "Authorization"
94+
token_auth_scheme = "Bearer"
95+
is_anonymous_access_allowed = "false"
96+
issuers = ["https://identity.oraclecloud.com/"]
97+
audiences = ["https://www.oracle.com/"]
98+
max_clock_skew_in_seconds = "10"
99+
100+
public_keys {
101+
type = "REMOTE_JWKS"
102+
max_cache_duration_in_hours = "10"
103+
uri = "https://oracle.com/jwks.json"
104+
}
105+
}
106+
}
107+
}
108+
}
109+
routes {
110+
backend {
111+
type = "HTTP_BACKEND"
112+
url = "https://api.weather.gov"
113+
}
114+
115+
path = "/hello"
116+
methods = ["GET"]
117+
118+
}
119+
}
120+
}
121+
122+
data "oci_apigateway_gateways" "test_gateways" {
123+
#Required
124+
compartment_id = var.compartment_ocid
125+
126+
#Optional
127+
state = var.gateway_state
128+
}
129+
130+
data "oci_apigateway_deployments" "test_deployments" {
131+
#Required
132+
compartment_id = var.compartment_ocid
133+
134+
#Optional
135+
gateway_id = oci_apigateway_gateway.test_gateway.id
136+
state = var.deployment_state
137+
}

‎examples/api_gateway/dynamic_routing/main.tf‎

Lines changed: 170 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,170 @@
1+
// Copyright (c) 2017, 2021, 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+
variable "user_ocid" {
8+
}
9+
10+
variable "fingerprint" {
11+
}
12+
13+
variable "private_key_path" {
14+
}
15+
16+
variable "region" {
17+
}
18+
19+
variable "compartment_ocid" {
20+
}
21+
22+
variable "gateway_endpoint_type" {
23+
default = "PRIVATE"
24+
}
25+
26+
variable "gateway_state" {
27+
default = "ACTIVE"
28+
}
29+
30+
variable "deployment_path_prefix" {
31+
default = "/v1"
32+
}
33+
34+
variable "deployment_specification_routes_backend_type" {
35+
default = "DYNAMIC_ROUTING_BACKEND"
36+
}
37+
38+
variable "deployment_specification_routes_backend_" {
39+
default = "DYNAMIC_ROUTING_BACKEND"
40+
}
41+
42+
variable "deployment_specification_routes_methods" {
43+
default = ["GET"]
44+
}
45+
46+
variable "deployment_specification_routes_path" {
47+
default = "/hello"
48+
}
49+
50+
variable "deployment_state" {
51+
default = "ACTIVE"
52+
}
53+
54+
variable "deployment_specification_routes_backend_selection_source_type" {
55+
default = "SINGLE"
56+
}
57+
58+
variable "deployment_specification_routes_backend_selection_source_selector" {
59+
default = "request.headers[route]"
60+
}
61+
62+
variable "deployment_specification_routes_backend_routing_backends_key_type" {
63+
default = "ANY_OF"
64+
}
65+
66+
variable "deployment_specification_routes_backend_routing_backends_key_values" {
67+
default = ["test", "def"]
68+
}
69+
70+
variable "deployment_specification_routes_backend_routing_backends_key_name" {
71+
default = "key1"
72+
}
73+
74+
variable "deployment_specification_routes_backend_routing_backends_backend_type" {
75+
default = "HTTP_BACKEND"
76+
}
77+
78+
variable "deployment_specification_routes_backend_routing_backends_backend_url" {
79+
default = "https://api.weather.gov"
80+
}
81+
82+
provider "oci" {
83+
tenancy_ocid = var.tenancy_ocid
84+
user_ocid = var.user_ocid
85+
fingerprint = var.fingerprint
86+
private_key_path = var.private_key_path
87+
region = var.region
88+
}
89+
90+
resource "oci_core_subnet" "regional_subnet" {
91+
cidr_block = "10.0.1.0/24"
92+
display_name = "regionalSubnet"
93+
dns_label = "regionalsubnet"
94+
compartment_id = var.compartment_ocid
95+
vcn_id = oci_core_vcn.vcn1.id
96+
security_list_ids = [oci_core_vcn.vcn1.default_security_list_id]
97+
route_table_id = oci_core_vcn.vcn1.default_route_table_id
98+
dhcp_options_id = oci_core_vcn.vcn1.default_dhcp_options_id
99+
}
100+
101+
data "oci_identity_availability_domain" "ad" {
102+
compartment_id = var.tenancy_ocid
103+
ad_number = 1
104+
}
105+
106+
resource "oci_core_vcn" "vcn1" {
107+
cidr_block = "10.0.0.0/16"
108+
compartment_id = var.compartment_ocid
109+
display_name = "exampleVCN"
110+
dns_label = "tfexamplevcn"
111+
}
112+
113+
resource "oci_apigateway_gateway" "test_gateway" {
114+
#Required
115+
compartment_id = var.compartment_ocid
116+
endpoint_type = var.gateway_endpoint_type
117+
subnet_id = oci_core_subnet.regional_subnet.id
118+
}
119+
120+
resource "oci_apigateway_deployment" "test_deployment" {
121+
#Required
122+
compartment_id = var.compartment_ocid
123+
gateway_id = oci_apigateway_gateway.test_gateway.id
124+
path_prefix = var.deployment_path_prefix
125+
126+
specification {
127+
routes {
128+
#Required
129+
backend {
130+
#Required
131+
type = var.deployment_specification_routes_backend_type
132+
selection_source {
133+
type = var.deployment_specification_routes_backend_selection_source_type
134+
selector = var.deployment_specification_routes_backend_selection_source_selector
135+
}
136+
routing_backends {
137+
key {
138+
type = var.deployment_specification_routes_backend_routing_backends_key_type
139+
values = var.deployment_specification_routes_backend_routing_backends_key_values
140+
name = var.deployment_specification_routes_backend_routing_backends_key_name
141+
}
142+
backend {
143+
type = var.deployment_specification_routes_backend_routing_backends_backend_type
144+
url = var.deployment_specification_routes_backend_routing_backends_backend_url
145+
}
146+
}
147+
}
148+
path = var.deployment_specification_routes_path
149+
methods = var.deployment_specification_routes_methods
150+
}
151+
}
152+
}
153+
154+
data "oci_apigateway_gateways" "test_gateways" {
155+
#Required
156+
compartment_id = var.compartment_ocid
157+
158+
#Optional
159+
state = var.gateway_state
160+
}
161+
162+
data "oci_apigateway_deployments" "test_deployments" {
163+
#Required
164+
compartment_id = var.compartment_ocid
165+
166+
#Optional
167+
gateway_id = oci_apigateway_gateway.test_gateway.id
168+
state = var.deployment_state
169+
}
170+

‎examples/datascience/notebook/artifact.zip‎ renamed to ‎examples/datascience/model_catalog/artifact.zip‎

File renamed without changes.

0 commit comments

Comments
 (0)