Skip to content

Commit cb0cf07

Browse files
sagarp337sagarp337
authored
Merge pull request #2064 from oracle/release_gh
Releasing version 5.33.0
2 parents 6e4c19e + 128874a commit cb0cf07

File tree

313 files changed

+20871
-498
lines changed

Some content is hidden

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

313 files changed

+20871
-498
lines changed

‎CHANGELOG.md‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
## 5.33.0 (March 12, 2024)
2+
3+
### Added
4+
- Support for OCI Control Center (OCC) 2.0 Feature Release
5+
- Support for Adding task schedule API
6+
- Support for New Dev License type | ADB on ADB-C@C
7+
- Support for ACD Placement Parameters (Split, Affinity) | ADB-D and ADB-C@C
8+
- Support for OCI Data Science Model Deployment Autoscaling
9+
### Bug Fix
10+
- remove hardcoded values
11+
- remove space from url
12+
113
## 5.32.0 (March 06, 2024)
214

315
### Added

‎examples/README.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ This directory contains Terraform configuration files showing how to create spec
3737
[![Deploy to Oracle Cloud](https://oci-resourcemanager-plugin.plugins.oci.oraclecloud.com/latest/deploy-to-oracle-cloud.svg)](https://cloud.oracle.com/resourcemanager/stacks/create?zipUrl=https://github.com/oracle/terraform-provider-oci/raw/master/examples/zips/blockchain.zip)
3838
- budget
3939
[![Deploy to Oracle Cloud](https://oci-resourcemanager-plugin.plugins.oci.oraclecloud.com/latest/deploy-to-oracle-cloud.svg)](https://cloud.oracle.com/resourcemanager/stacks/create?zipUrl=https://github.com/oracle/terraform-provider-oci/raw/master/examples/zips/budget.zip)
40+
- capacity_management
41+
[![Deploy to Oracle Cloud](https://oci-resourcemanager-plugin.plugins.oci.oraclecloud.com/latest/deploy-to-oracle-cloud.svg)](https://cloud.oracle.com/resourcemanager/stacks/create?zipUrl=https://github.com/oracle/terraform-provider-oci/raw/master/examples/zips/capacity_management.zip)
4042
- certificatesManagement
4143
[![Deploy to Oracle Cloud](https://oci-resourcemanager-plugin.plugins.oci.oraclecloud.com/latest/deploy-to-oracle-cloud.svg)](https://cloud.oracle.com/resourcemanager/stacks/create?zipUrl=https://github.com/oracle/terraform-provider-oci/raw/master/examples/zips/certificatesManagement.zip)
4244
- cloudBridge

‎examples/capacity_management/InternalOccAvailabilityCatalogs/internal_occ_availability_catalog.tf‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
// Copyright (c) 2017, 2023, 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 "internal_occ_availability_catalog_catalog_state" {
12+
default = "NOT_UPLOADED"
13+
}
14+
15+
variable "internal_occ_availability_catalog_display_name" {
16+
default = "displayName"
17+
}
18+
19+
variable "internal_occ_availability_catalog_id" {
20+
default = "id"
21+
}
22+
23+
variable "internal_occ_availability_catalog_namespace" {
24+
default = "COMPUTE"
25+
}
26+
27+
28+
29+
provider "oci" {
30+
tenancy_ocid = var.tenancy_ocid
31+
user_ocid = var.user_ocid
32+
fingerprint = var.fingerprint
33+
private_key_path = var.private_key_path
34+
region = var.region
35+
}
36+
37+
data "oci_capacity_management_internal_occ_availability_catalogs" "test_internal_occ_availability_catalogs" {
38+
#Required
39+
compartment_id = var.compartment_id
40+
41+
#Optional
42+
catalog_state = var.internal_occ_availability_catalog_catalog_state
43+
display_name = var.internal_occ_availability_catalog_display_name
44+
id = var.internal_occ_availability_catalog_id
45+
namespace = var.internal_occ_availability_catalog_namespace
46+
occ_customer_group_id = oci_capacity_management_occ_customer_group.test_occ_customer_group.id
47+
}

‎examples/capacity_management/OccAvailabilityCatalogContents/occ_availability_catalog_content.tf‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
// Copyright (c) 2017, 2023, 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+
10+
11+
12+
provider "oci" {
13+
tenancy_ocid = var.tenancy_ocid
14+
user_ocid = var.user_ocid
15+
fingerprint = var.fingerprint
16+
private_key_path = var.private_key_path
17+
region = var.region
18+
}
19+
20+
data "oci_capacity_management_occ_availability_catalog_contents" "test_occ_availability_catalog_contents" {
21+
#Required
22+
occ_availability_catalog_id = oci_capacity_management_occ_availability_catalog.test_occ_availability_catalog.id
23+
}

‎examples/capacity_management/OccAvailabilityCatalogOccAvailabilities/occ_availability_catalog_occ_availability.tf‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
// Copyright (c) 2017, 2023, 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+
10+
variable "occ_availability_catalog_occ_availability_date_expected_capacity_handover" {
11+
default = "dateExpectedCapacityHandover"
12+
}
13+
14+
variable "occ_availability_catalog_occ_availability_resource_type" {
15+
default = "SERVER_HW"
16+
}
17+
18+
variable "occ_availability_catalog_occ_availability_workload_type" {
19+
default = "GENERIC"
20+
}
21+
22+
23+
24+
provider "oci" {
25+
tenancy_ocid = var.tenancy_ocid
26+
user_ocid = var.user_ocid
27+
fingerprint = var.fingerprint
28+
private_key_path = var.private_key_path
29+
region = var.region
30+
}
31+
32+
data "oci_capacity_management_occ_availability_catalog_occ_availabilities" "test_occ_availability_catalog_occ_availabilities" {
33+
#Required
34+
occ_availability_catalog_id = oci_capacity_management_occ_availability_catalog.test_occ_availability_catalog.id
35+
36+
#Optional
37+
date_expected_capacity_handover = var.occ_availability_catalog_occ_availability_date_expected_capacity_handover
38+
resource_name = oci_usage_proxy_resource.test_resource.name
39+
resource_type = var.occ_availability_catalog_occ_availability_resource_type
40+
workload_type = var.occ_availability_catalog_occ_availability_workload_type
41+
}

‎examples/capacity_management/OccAvailabilityCatalogs/occ_availability_catalog.tf‎

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
// Copyright (c) 2017, 2023, 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 "occ_availability_catalog_base64encoded_catalog_details" {
12+
default = "U2VxIE5vLEZpbmFsIEN1c3RvbWVyIE9yZGVFkIFR5cGUsTmFtZSxBdmFpbGFibGUgUXVhbnRpdHksVW5pdA0KMSwyMDIzLTAyLTAyLDIwMjMtMDItMTYsU0VSVkVSIEhXLEdlbmVyaWMsQk0uU3RhbmRhcmQyLjUyMSwyMzUsU2VydmVycw0KMiwyMDIzLTAyLTAyLDIwMjMtMDItMTYsU0VSVkVSIEhXLEdlbmVyaWMsQk0uU3RhbmRhcmQyLjUyMywzNjcsU2VydmVycw0KMywyMDIzLTAyLTAyLDIwMjMtMDItMTYsU0VSVkVSIEhXLEdlbmVyaWMsQk0uU3RhbmRhcmQyLjUyLDEyLFNlcnZlcnMNCjQsMjAyMy0wMi0wMiwyMDIzLTAyLTE2LFNFUlZFUiBIVyxST1csQk0uRGVuc2VPLkU0LjEzMSwzMTQsU2VydmVycw0KNSwyMDIzLTAyLTE2LDIwMjMtMDItMDMsU0VSVkVSIEhXLEdlbmVyaWMsQk0uRGVuc2VPLkU0LjEyOCwyMzUsU2VydmVycw0KNiwyMDIzLTAyLTE2LDIwMjMtMDItMDMsU0VSVkVSIEhXLEdlbmVyaWMsQk0uQmlnRGF0YTMuRTQuMTI4LDM2NyxTZXJ2ZXJzDQo3LDIwMjMtMDItMTYsMjAyMy0wMi0wMyxTRVJWRVIgSFcsR2VuZXJpYyxCTS5TdGFuZGFyZDIuNTIsMTIsU2VydmVycw0KOCwyMDIzLTAyLTE2LDIwMjMtMDItMDMsU0VSVkVSIEhXLFJPVyxCTS5EZW5zZU8uRTQuMTMxLDMxNCxTZXJ2ZXJzDQo5LDIwMjMtMDItMTYsMjAyMy0wMi0wMyxTRVJWRVIgSFcsUk9XLEU0MlQgV2hpdGVib3gsNzIyLFNlcnZlcnMNCjEwLDIwMjMtMDItMDIsMjAyMy0wMi0xNixDQVBBQ0lUWSBDT05TVFJBSU5ULEdlbmVyaWMsVVMtQVNIQlVSTi0xLUFELTEsNDg2NCxTZXJ2ZXJzDQoxMSwyMDIzLTAyLTAyLDIwMjMtMDItMTYsQ0FQQUNJVFkgQ09OU1RSQUlOVCxST1csVVMtQVNIQlVSTi0xLUFELTEsNDg2NCxTZXJ2ZXJzDQoxMiwyMDIzLTAyLTAyLDIwMjMtMDItMTYsQ0FQQUNJVFkgQ09OU1RSQUlOVCxHZW5lcmljLFVTLUFTSEJVUk4tMS1BRC0yLDQ4NjQsU2VydmVycw0KMTMsMjAyMy0wMi0wMiwyMDIzLTAyLTE2LENBUEFDSVRZIENPTlNUUkFJTlQsUk9XLFVTLUFTSEJVUk4tMS1BRC0yLDQ4NjQsU2VydmVycw0KMTQsMjAyMy0wMi0xNiwyMDIzLTAyLTAzLENBUEFDSVRZIENPTlNUUkFJTlQsR2VuZXJpYyxVUy1BU0hCVVJOLTEtQUQtMSw2MDIyLFNlcnZlcnMNCjE1LDIwMjMtMDItDT05TVFJBSU5ULFJPVyxVUy1BU0hCVVJOLTEtQUQtMiw2MDIyLFNlcnZlcnM="
13+
}
14+
15+
variable "occ_availability_catalog_catalog_state" {
16+
default = "NOT_UPLOADED"
17+
}
18+
19+
variable "occ_availability_catalog_defined_tags_value" {
20+
default = "value"
21+
}
22+
23+
variable "occ_availability_catalog_description" {
24+
default = "description"
25+
}
26+
27+
variable "occ_availability_catalog_display_name" {
28+
default = "displayName"
29+
}
30+
31+
variable "occ_availability_catalog_freeform_tags" {
32+
default = { "bar-key" = "value" }
33+
}
34+
35+
variable "occ_availability_catalog_id" {
36+
default = "id"
37+
}
38+
39+
variable "occ_availability_catalog_metadata_details_format_version" {
40+
default = "V1"
41+
}
42+
43+
variable "occ_availability_catalog_namespace" {
44+
default = "COMPUTE"
45+
}
46+
47+
48+
49+
provider "oci" {
50+
tenancy_ocid = var.tenancy_ocid
51+
user_ocid = var.user_ocid
52+
fingerprint = var.fingerprint
53+
private_key_path = var.private_key_path
54+
region = var.region
55+
}
56+
57+
resource "oci_capacity_management_occ_availability_catalog" "test_occ_availability_catalog" {
58+
#Required
59+
base64encoded_catalog_details = var.occ_availability_catalog_base64encoded_catalog_details
60+
compartment_id = var.compartment_id
61+
display_name = var.occ_availability_catalog_display_name
62+
namespace = var.occ_availability_catalog_namespace
63+
occ_customer_group_id = oci_capacity_management_occ_customer_group.test_occ_customer_group.id
64+
65+
#Optional
66+
defined_tags = map(oci_identity_tag_namespace.tag-namespace1.name.oci_identity_tag.tag1.name, var.occ_availability_catalog_defined_tags_value)
67+
description = var.occ_availability_catalog_description
68+
freeform_tags = var.occ_availability_catalog_freeform_tags
69+
metadata_details {
70+
#Required
71+
format_version = var.occ_availability_catalog_metadata_details_format_version
72+
}
73+
}
74+
75+
data "oci_capacity_management_occ_availability_catalogs" "test_occ_availability_catalogs" {
76+
#Required
77+
compartment_id = var.compartment_id
78+
79+
#Optional
80+
catalog_state = var.occ_availability_catalog_catalog_state
81+
display_name = var.occ_availability_catalog_display_name
82+
id = var.occ_availability_catalog_id
83+
namespace = var.occ_availability_catalog_namespace
84+
}

‎examples/capacity_management/OccCapacityRequests/occ_capacity_request.tf‎

Lines changed: 146 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,146 @@
1+
// Copyright (c) 2017, 2023, 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 "occ_capacity_request_availability_domain" {
12+
default = "availabilityDomain"
13+
}
14+
15+
variable "occ_capacity_request_date_expected_capacity_handover" {
16+
default = "2023/12/17"
17+
}
18+
19+
variable "occ_capacity_request_defined_tags_value" {
20+
default = "value"
21+
}
22+
23+
variable "occ_capacity_request_description" {
24+
default = "This is the test request created for UI"
25+
}
26+
27+
variable "occ_capacity_request_details_actual_handover_quantity" {
28+
default = 10
29+
}
30+
31+
variable "occ_capacity_request_details_date_actual_handover" {
32+
default = "dateActualHandover"
33+
}
34+
35+
variable "occ_capacity_request_details_date_expected_handover" {
36+
default = "dateExpectedHandover"
37+
}
38+
39+
variable "occ_capacity_request_details_demand_quantity" {
40+
default = 10
41+
}
42+
43+
variable "occ_capacity_request_details_expected_handover_quantity" {
44+
default = 10
45+
}
46+
47+
variable "occ_capacity_request_details_resource_type" {
48+
default = "SERVER_HW"
49+
}
50+
51+
variable "occ_capacity_request_details_workload_type" {
52+
default = "GENERIC"
53+
}
54+
55+
variable "occ_capacity_request_display_name" {
56+
default = "UI test request"
57+
}
58+
59+
variable "occ_capacity_request_freeform_tags" {
60+
default = { "bar-key" = "value" }
61+
}
62+
63+
variable "occ_capacity_request_id" {
64+
default = "id"
65+
}
66+
67+
variable "occ_capacity_request_lifecycle_details" {
68+
default = "lifecycleDetails"
69+
}
70+
71+
variable "occ_capacity_request_namespace" {
72+
default = "COMPUTE"
73+
}
74+
75+
variable "occ_capacity_request_region" {
76+
default = "US-ASHBURN-1"
77+
}
78+
79+
variable "occ_capacity_request_request_state" {
80+
default = "SUBMITTED"
81+
}
82+
83+
84+
85+
provider "oci" {
86+
tenancy_ocid = var.tenancy_ocid
87+
user_ocid = var.user_ocid
88+
fingerprint = var.fingerprint
89+
private_key_path = var.private_key_path
90+
region = var.region
91+
}
92+
93+
resource "oci_capacity_management_occ_capacity_request" "test_occ_capacity_request" {
94+
#Required
95+
availability_domain = var.occ_capacity_request_availability_domain
96+
compartment_id = var.compartment_id
97+
date_expected_capacity_handover = var.occ_capacity_request_date_expected_capacity_handover
98+
details {
99+
#Required
100+
demand_quantity = var.occ_capacity_request_details_demand_quantity
101+
resource_name = oci_usage_proxy_resource.test_resource.name
102+
resource_type = var.occ_capacity_request_details_resource_type
103+
workload_type = var.occ_capacity_request_details_workload_type
104+
105+
#Optional
106+
actual_handover_quantity = var.occ_capacity_request_details_actual_handover_quantity
107+
date_actual_handover = var.occ_capacity_request_details_date_actual_handover
108+
date_expected_handover = var.occ_capacity_request_details_date_expected_handover
109+
expected_handover_quantity = var.occ_capacity_request_details_expected_handover_quantity
110+
}
111+
display_name = var.occ_capacity_request_display_name
112+
namespace = var.occ_capacity_request_namespace
113+
occ_availability_catalog_id = oci_capacity_management_occ_availability_catalog.test_occ_availability_catalog.id
114+
occ_capacity_request_id = var.occ_capacity_request_occ_capacity_request_id
115+
region = var.occ_capacity_request_region
116+
117+
#Optional
118+
defined_tags = map(oci_identity_tag_namespace.tag-namespace1.name.oci_identity_tag.tag1.name, var.occ_capacity_request_defined_tags_value)
119+
description = var.occ_capacity_request_description
120+
freeform_tags = var.occ_capacity_request_freeform_tags
121+
lifecycle_details = var.occ_capacity_request_lifecycle_details
122+
patch_operations {
123+
#Required
124+
operation = var.occ_capacity_request_patch_operations_operation
125+
selection = var.occ_capacity_request_patch_operations_selection
126+
127+
#Optional
128+
from = var.occ_capacity_request_patch_operations_from
129+
position = var.occ_capacity_request_patch_operations_position
130+
selected_item = var.occ_capacity_request_patch_operations_selected_item
131+
value = var.occ_capacity_request_patch_operations_value
132+
values = var.occ_capacity_request_patch_operations_values
133+
}
134+
request_state = var.occ_capacity_request_request_state
135+
}
136+
137+
data "oci_capacity_management_occ_capacity_requests" "test_occ_capacity_requests" {
138+
#Required
139+
compartment_id = var.compartment_id
140+
141+
#Optional
142+
display_name = var.occ_capacity_request_display_name
143+
id = var.occ_capacity_request_id
144+
namespace = var.occ_capacity_request_namespace
145+
occ_availability_catalog_id = oci_capacity_management_occ_availability_catalog.test_occ_availability_catalog.id
146+
}

0 commit comments

Comments
 (0)