Skip to content

Commit cc38725

Browse files
author
Monica Joshi
authored
Merge pull request #2171 from oracle/release_gh
Release gh
2 parents a5cd0fa + 2186a5f commit cc38725

File tree

772 files changed

+31636
-3111
lines changed

Some content is hidden

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

772 files changed

+31636
-3111
lines changed

‎CHANGELOG.md‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1+
## 6.6.0 (August 07, 2024)
2+
3+
### Added
4+
- Support for BDS - Implement ODH Patching in Staged manner
5+
- Support for Java Management Service 9.0
6+
- Support for Pull Request - settings and protected branches
7+
- Support for Functionality enhancements to support in-place DbSystem updates
8+
- Support for OS Management Hub: Limit CSS/VCSS content to the latest package versions only
9+
- remove useless code
10+
- Support for Java Management Service 9.0 - Java Downloads Component
11+
- Support for BDS - Autoscale with Memory Utilization
12+
- Support for [DMS] to fix the initial load settings issue
13+
114
## 6.5.0 (July 30, 2024)
215

316
### Added

‎examples/databasemigration/migration/migration.tf‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -296,6 +296,19 @@ resource "oci_database_migration_migration" "test_oracle_rds_migration" {
296296
namespace = "namespace"
297297
}
298298
}
299+
initial_load_settings {
300+
job_mode = "SCHEMA"
301+
export_directory_object {
302+
name = "name"
303+
path = "/test/test/test/dumpdir"
304+
305+
}
306+
data_pump_parameters {
307+
estimate = "BLOCKS"
308+
is_cluster = "false"
309+
table_exists_action = "TRUNCATE"
310+
}
311+
}
299312
type = "ONLINE"
300313
display_name = "displayName"
301314
}

‎examples/devops/pull_request/pullrequest.tf‎

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
variable "branch_name" {
2+
default = "<branch_name>"
3+
}
4+
variable "repository_id" {
5+
}
6+
variable "project_id" {
7+
}
8+
variable "repository_setting_merge_checks_last_build_succeeded"{
9+
default = "DISABLED"
10+
}
11+
variable "repository_setting_approval_rules_items_min_approvals_count" {
12+
default = 1
13+
}
14+
15+
resource "oci_devops_repository_protected_branch_management" "test_repository_protected_branch_management" {
16+
#Required
17+
branch_name = var.branch_name
18+
repository_id = var.repository_id
19+
20+
#Optional
21+
# protection_levels = <protection_levels>
22+
}
23+
24+
resource "oci_devops_project_repository_setting" "test_project_repository_setting" {
25+
#Required
26+
project_id = var.project_id
27+
28+
#Optional
29+
approval_rules {
30+
#Required
31+
items {
32+
#Required
33+
min_approvals_count = var.repository_setting_approval_rules_items_min_approvals_count
34+
name = "ApprovalRuleName"
35+
36+
#Optional
37+
destination_branch = var.branch_name
38+
reviewers {
39+
#Required
40+
principal_id = <reviewers>
41+
}
42+
}
43+
}
44+
merge_settings {
45+
#Required
46+
allowed_merge_strategies = ["MERGE_COMMIT", "FAST_FORWARD"]
47+
default_merge_strategy = "MERGE_COMMIT"
48+
}
49+
}
50+
51+
resource "oci_devops_repository_setting" "test_repository_setting" {
52+
#Required
53+
repository_id = var.repository_id
54+
55+
#Optional
56+
approval_rules {
57+
#Required
58+
items {
59+
#Required
60+
min_approvals_count = var.repository_setting_approval_rules_items_min_approvals_count
61+
name = "ApprovalName"
62+
63+
#Optional
64+
destination_branch = var.branch_name
65+
reviewers {
66+
#Required
67+
principal_id = "<principal_id>"
68+
}
69+
}
70+
}
71+
merge_checks {
72+
#Required
73+
last_build_succeeded = var.repository_setting_merge_checks_last_build_succeeded
74+
}
75+
merge_settings {
76+
#Required
77+
allowed_merge_strategies = ["MERGE_COMMIT", "FAST_FORWARD"]
78+
default_merge_strategy = "MERGE_COMMIT"
79+
}
80+
}

‎examples/devops/scm_service/repositories.tf‎

Lines changed: 106 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,140 @@
1+
# Step 5 - Ensure Backward compatibility
2+
variable "tenancy_ocid" {}
3+
variable "user_ocid" {}
4+
variable "fingerprint" {}
5+
variable "private_key_path" {}
6+
variable "compartment_ocid" {}
7+
variable "region" {}
8+
variable "default_branch" {}
9+
variable "baseVersion" {
10+
default = "master"
11+
}
12+
variable "baseVersion_fork" {
13+
default = "main"
14+
}
15+
variable "targetVersion" {
16+
default = "<target>"
17+
}
18+
variable "connection_access_token" {
19+
default = ""
20+
}
21+
22+
provider "oci" {
23+
version = "5.13.0"
24+
region = var.region
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+
}
30+
31+
resource "random_string" "topicname" {
32+
length = 10
33+
special = false
34+
}
35+
36+
resource "random_string" "projectname" {
37+
length = 10
38+
special = false
39+
}
40+
41+
resource "oci_ons_notification_topic" "test_notification_topic" {
42+
#Required
43+
compartment_id = var.compartment_ocid
44+
name = join("", ["A", random_string.topicname.result])
45+
}
46+
47+
# Create Project
48+
resource "oci_devops_project" "test_project" {
49+
#Required
50+
compartment_id = var.compartment_ocid
51+
name = join("", ["A", random_string.projectname.result])
52+
notification_config {
53+
#Required
54+
topic_id = oci_ons_notification_topic.test_notification_topic.id
55+
}
56+
}
57+
58+
resource "oci_devops_connection" "test_connection" {
59+
#Required
60+
connection_type = "GITHUB_ACCESS_TOKEN"
61+
project_id = oci_devops_project.test_project.id
62+
access_token = var.connection_access_token
63+
64+
#Optional
65+
description = "description"
66+
display_name = "display_name"
67+
}
68+
69+
# Create HOSTED repository
170
resource "oci_devops_repository" "test_repository" {
271
#Required
372
name = "repositoryName"
473
project_id = oci_devops_project.test_project.id
74+
repository_type = "HOSTED"
575

676
#Optional
7-
default_branch = "defaultBranch"
77+
default_branch = var.default_branch
878
description = "description"
9-
repository_type = "HOSTED"
1079
}
1180

81+
# Create new branch in HOSTED repository
82+
resource "oci_devops_repository_ref" "test_repository_ref" {
83+
commit_id = lookup(data.oci_devops_repository_commits.test_repository_commits.repository_commit_collection[0].items[0], "commit_id")
84+
ref_name = "<refName>"
85+
ref_type = "BRANCH"
86+
repository_id = oci_devops_repository.test_repository.id
87+
88+
lifecycle {
89+
ignore_changes = [
90+
defined_tags,
91+
freeform_tags
92+
]
93+
}
94+
}
95+
96+
# Create MIRRORED repository
1297
resource "oci_devops_repository" "test_mirrored_repository" {
1398
#Required
1499
name = "repositoryMirroredName"
15100
project_id = oci_devops_project.test_project.id
101+
repository_type = "MIRRORED"
16102

17103
#Optional
18-
default_branch = "defaultBranch"
104+
default_branch = var.default_branch
19105
description = "description"
20-
repository_type = "MIRRORED"
21106
mirror_repository_config {
22107
connector_id = oci_devops_connection.test_connection.id
23-
repository_url = "https://github.com/Maxrovr/hello-dev"
108+
repository_url = "<repository_url>"
24109
trigger_schedule {
25110
schedule_type = "NONE"
26111
}
27112
}
28113
}
29114

115+
# Mirror/Sync MIRRORED repository
30116
resource "oci_devops_repository_mirror" "test_repository_mirror" {
31117
#Required
32118
repository_id = oci_devops_repository.test_mirrored_repository.id
33119
}
34120

35-
resource "oci_devops_repository_ref" "test_repository_ref" {
36-
commit_id = "commitId"
37-
ref_name = "refName"
38-
ref_type = "BRANCH"
121+
# Retrieve List of commits in HOSTED repository
122+
data "oci_devops_repository_commits" "test_repository_commits" {
123+
#Required
39124
repository_id = oci_devops_repository.test_repository.id
40125
}
41126

42-
resource "oci_devops_repository_ref" "test_repository_ref" {
43-
object_id = "object_id"
44-
ref_name = "refName"
45-
ref_type = "TAG"
127+
# ListCommitsDiff
128+
data "oci_devops_repository_diffs" "test_repository_diff" {
129+
#Required
130+
base_version = var.baseVersion_fork
46131
repository_id = oci_devops_repository.test_repository.id
132+
target_version = var.targetVersion
133+
134+
#Optional
135+
is_comparison_from_merge_base = false
47136
}
137+
138+
output "commit_diffs" {
139+
value = data.oci_devops_repository_diffs.test_repository_diff
140+
}

‎examples/devops/scm_service/test/main.tf‎

Lines changed: 119 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,119 @@
1+
#Step 6 - Example
2+
variable "tenancy_ocid" {}
3+
variable "user_ocid" {}
4+
variable "fingerprint" {}
5+
variable "private_key_path" {}
6+
variable "compartment_ocid" {}
7+
variable "region" {}
8+
variable "default_branch" {}
9+
variable "baseVersion" {
10+
default = "master"
11+
}
12+
variable "baseVersion_fork" {
13+
default = "main"
14+
}
15+
variable "targetVersion" {
16+
default = "<target>"
17+
}
18+
variable "connection_access_token" {
19+
default = ""
20+
}
21+
22+
resource "random_string" "topicname" {
23+
length = 10
24+
special = false
25+
}
26+
27+
resource "random_string" "projectname" {
28+
length = 10
29+
special = false
30+
}
31+
32+
resource "oci_ons_notification_topic" "test_notification_topic" {
33+
#Required
34+
compartment_id = var.compartment_ocid
35+
name = join("", ["A", random_string.topicname.result])
36+
}
37+
38+
# Create Project
39+
resource "oci_devops_project" "test_project" {
40+
#Required
41+
compartment_id = var.compartment_ocid
42+
name = join("", ["A", random_string.projectname.result])
43+
notification_config {
44+
#Required
45+
topic_id = oci_ons_notification_topic.test_notification_topic.id
46+
}
47+
}
48+
49+
resource "oci_devops_connection" "test_connection" {
50+
#Required
51+
connection_type = "GITHUB_ACCESS_TOKEN"
52+
project_id = oci_devops_project.test_project.id
53+
access_token = var.connection_access_token
54+
55+
#Optional
56+
description = "description"
57+
display_name = "display_name"
58+
}
59+
60+
# Create HOSTED repository
61+
resource "oci_devops_repository" "test_repository" {
62+
#Required
63+
name = "repositoryName"
64+
project_id = oci_devops_project.test_project.id
65+
repository_type = "HOSTED"
66+
67+
#Optional
68+
default_branch = var.default_branch
69+
description = "description"
70+
}
71+
72+
# Retrieve List of commits in HOSTED repository
73+
data "oci_devops_repository_commits" "test_repository_commits" {
74+
#Required
75+
repository_id = oci_devops_repository.test_repository.id
76+
}
77+
78+
# Create new branch in HOSTED repository
79+
resource "oci_devops_repository_ref" "test_repository_ref" {
80+
commit_id = lookup(data.oci_devops_repository_commits.test_repository_commits.repository_commit_collection[0].items[0], "commit_id")
81+
ref_name = "<refName>"
82+
ref_type = "BRANCH"
83+
repository_id = oci_devops_repository.test_repository.id
84+
85+
lifecycle {
86+
ignore_changes = [
87+
defined_tags,
88+
freeform_tags
89+
]
90+
}
91+
}
92+
93+
# Creating new resource FORKED repository
94+
resource "oci_devops_repository" "test_repository_fork" {
95+
#Required
96+
name = "forkRepositoryName"
97+
project_id = oci_devops_project.test_project.id
98+
repository_type = "FORKED"
99+
100+
#Optional
101+
description = "description"
102+
parent_repository_id = oci_devops_repository.test_repository.id
103+
}
104+
105+
# ListCommitsDiff
106+
data "oci_devops_repository_diffs" "test_repository_diff" {
107+
#Required
108+
base_version = var.baseVersion_fork
109+
repository_id = oci_devops_repository.test_repository_fork.id
110+
target_version = var.targetVersion
111+
112+
#Optional
113+
is_comparison_from_merge_base = false
114+
target_repository_id = oci_devops_repository.test_repository.id
115+
}
116+
117+
output "commit_diffs" {
118+
value = data.oci_devops_repository_diffs.test_repository_diff
119+
}

0 commit comments

Comments
 (0)