Skip to content

Commit 261ee01

Browse files
Terraform Team AutomationMonica Joshi
Terraform Team Automation
authored and
Monica Joshi
committed
Added - remove useless code
1 parent 7f76d74 commit 261ee01

21 files changed

+638
-50
lines changed

‎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+
}

‎internal/integrationtest/devops_repository_diff_test.go‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,11 @@ var (
2525
}
2626

2727
DevopsRepositoryDiffDataSourceRepresentation = map[string]interface{}{
28-
"base_version": acctest.Representation{RepType: acctest.Required, Create: `main`},
29-
"repository_id": acctest.Representation{RepType: acctest.Required, Create: `${oci_devops_repository.test_repository.id}`},
30-
"target_version": acctest.Representation{RepType: acctest.Required, Create: `main`},
28+
"base_version": acctest.Representation{RepType: acctest.Required, Create: `baseVersion`},
29+
"repository_id": acctest.Representation{RepType: acctest.Required, Create: `${oci_devops_repository.test_repository.id}`},
30+
"target_version": acctest.Representation{RepType: acctest.Required, Create: `targetVersion`},
31+
"is_comparison_from_merge_base": acctest.Representation{RepType: acctest.Optional, Create: `false`},
32+
"target_repository_id": acctest.Representation{RepType: acctest.Optional, Create: `${oci_devops_repository.test_repository.id}`},
3133
}
3234

3335
DevopsRepositoryDiffResourceConfig = acctest.GenerateResourceFromRepresentationMap("oci_devops_project", "test_project", acctest.Required, acctest.Create, DevopsProjectRepresentation) +
@@ -63,6 +65,7 @@ func TestDevopsRepositoryDiffResource_basic(t *testing.T) {
6365
resource.TestCheckResourceAttr(datasourceName, "base_version", "baseVersion"),
6466
resource.TestCheckResourceAttr(datasourceName, "is_comparison_from_merge_base", "false"),
6567
resource.TestCheckResourceAttrSet(datasourceName, "repository_id"),
68+
resource.TestCheckResourceAttrSet(datasourceName, "target_repository_id"),
6669
resource.TestCheckResourceAttr(datasourceName, "target_version", "targetVersion"),
6770

6871
resource.TestCheckResourceAttrSet(datasourceName, "diff_collection.#"),

0 commit comments

Comments
 (0)