Skip to content

Commit 2be9025

Browse files
authored
Releasing version 4.20.0
Releasing version 4.20.0
2 parents 700f461 + 26d0ccb commit 2be9025

File tree

7,869 files changed

+91902
-66674
lines changed

Some content is hidden

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

7,869 files changed

+91902
-66674
lines changed

CHANGELOG.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
## 4.20.0 (Unreleased)
2+
3+
### Added
4+
- Support for VMware vSphere 7.x to Oracle Cloud VMware Solution added
5+
- Support for Cost Analysis: Forecasting added
6+
- Support for OCI Vulnerability Scanning Service
7+
- Support for artifacts container image datasource
8+
9+
### Fixed
10+
- Fixed `image_digest` field update behavior causing issues in `functions` resource
11+
112
## 4.19.0 (March 24, 2021)
213

314
### Added
Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
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+
variable "user_ocid" {}
6+
variable "fingerprint" {}
7+
variable "private_key_path" {}
8+
variable "region" {}
9+
variable "container_image_ocid" {}
10+
variable "container_image_repository_ocid" {}
11+
12+
variable "container_image_compartment_id_in_subtree" {
13+
default = false
14+
}
15+
16+
variable "container_image_is_versioned" {
17+
default = true
18+
}
19+
20+
variable "container_image_state" {
21+
default = "AVAILABLE"
22+
}
23+
24+
variable "container_image_repository_name" {
25+
default = "dont-delete-used-by-terraform-test/busybox"
26+
}
27+
28+
variable "container_image_display_name" {
29+
default = "dont-delete-used-by-terraform-test/busybox:latest"
30+
}
31+
32+
variable "image_version" {
33+
default = "latest"
34+
}
35+
36+
37+
provider "oci" {
38+
tenancy_ocid = var.tenancy_ocid
39+
user_ocid = var.user_ocid
40+
fingerprint = var.fingerprint
41+
private_key_path = var.private_key_path
42+
region = var.region
43+
}
44+
45+
data "oci_artifacts_container_image" "test_container_image" {
46+
#Required
47+
image_id = var.container_image_ocid
48+
}
49+
50+
data "oci_artifacts_container_images" "test_container_images" {
51+
#Required
52+
compartment_id = var.tenancy_ocid
53+
54+
#Optional
55+
compartment_id_in_subtree = var.container_image_compartment_id_in_subtree
56+
is_versioned = var.container_image_is_versioned
57+
state = var.container_image_state
58+
image_id = var.container_image_ocid
59+
display_name = var.container_image_display_name
60+
repository_id = var.container_image_repository_ocid
61+
repository_name = var.container_image_repository_name
62+
version = var.image_version
63+
}

examples/metering_computation/query/main.tf

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,18 @@ variable "dimensions_value" {
4040
default = "dimensions_value"
4141
}
4242

43+
variable "query_query_definition_report_query_forecast_forecast_type" {
44+
default = "BASIC"
45+
}
46+
47+
variable "query_query_definition_report_query_forecast_time_forecast_ended" {
48+
default = "2020-01-03T00:00:00.000Z"
49+
}
50+
51+
variable "query_query_definition_report_query_forecast_time_forecast_started" {
52+
default = "2020-01-02T00:00:00.000Z"
53+
}
54+
4355
resource "oci_metering_computation_query" "test_query" {
4456
#Required
4557
compartment_id = var.tenancy_ocid
@@ -81,6 +93,14 @@ resource "oci_metering_computation_query" "test_query" {
8193
}
8294
EOF
8395

96+
forecast {
97+
#Required
98+
time_forecast_ended = var.query_query_definition_report_query_forecast_time_forecast_ended
99+
100+
#Optional
101+
forecast_type = var.query_query_definition_report_query_forecast_forecast_type
102+
time_forecast_started = var.query_query_definition_report_query_forecast_time_forecast_started
103+
}
84104
group_by = []
85105
is_aggregate_by_time = false
86106
query_type = "COST"

examples/metering_computation/usage/main.tf

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,18 @@ variable "dimensions_value" {
4040
default = "dimensions_value"
4141
}
4242

43+
variable "usage_forecast_forecast_type" {
44+
default = "BASIC"
45+
}
46+
47+
variable "usage_forecast_time_forecast_ended" {
48+
default = "2020-01-03T00:00:00.000Z"
49+
}
50+
51+
variable "usage_forecast_time_forecast_started" {
52+
default = "2020-01-02T00:00:00.000Z"
53+
}
54+
4355
resource "oci_metering_computation_usage" "test_usage" {
4456
#Required
4557
granularity = "DAILY"
@@ -71,7 +83,14 @@ resource "oci_metering_computation_usage" "test_usage" {
7183
}
7284
EOF
7385

86+
forecast {
87+
#Required
88+
time_forecast_ended = var.usage_forecast_time_forecast_ended
7489

90+
#Optional
91+
forecast_type = var.usage_forecast_forecast_type
92+
time_forecast_started = var.usage_forecast_time_forecast_started
93+
}
7594
group_by = ["service"]
7695
query_type = "COST"
7796
}

0 commit comments

Comments
 (0)