Skip to content

Commit 35df8a1

Browse files
JBAnderson5JBAnderson5
authored
Merge branch 'oracle-devrel:main' into EBSsubmodules
2 parents 7714eb6 + 85164ff commit 35df8a1

File tree

50 files changed

+3763
-16
lines changed

Some content is hidden

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

50 files changed

+3763
-16
lines changed

‎.github/workflows/repolinter.yml

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
name: Repolinter
22
on:
33
pull_request_target:
4-
54
jobs:
65
run_repolinter:
76
name: Run Repolinter on pull request
@@ -25,14 +24,27 @@ jobs:
2524
echo $(cat repolinter_results.json)
2625
exit 0
2726
- name: Analyze the Repolinter results
28-
uses: oracle-devrel/[email protected]alpha1
27+
uses: oracle-devrel/[email protected]alpha2
2928
id: analysis
3029
with:
3130
json_results_file: '/github/workspace/repolinter_results.json'
3231
- name: Overall analysis results
3332
run: |
3433
echo "Passed: ${{ steps.analysis.outputs.passed }}"
3534
echo "Errored: ${{ steps.analysis.outputs.errored }}"
35+
- name: Comment if analysis finds missing disclaimer
36+
if: steps.analysis.outputs.disclaimer_found == 'false'
37+
uses: mshick/add-pr-comment@v1
38+
with:
39+
message: |
40+
:no_entry: **FAILURE: Missing Disclaimer**
41+
The standard Oracle Disclaimer seems to be missing from the readme. Please add it:
42+
43+
ORACLE AND ITS AFFILIATES DO NOT PROVIDE ANY WARRANTY WHATSOEVER, EXPRESS OR IMPLIED, FOR ANY SOFTWARE, MATERIAL OR CONTENT OF ANY KIND CONTAINED OR PRODUCED WITHIN THIS REPOSITORY, AND IN PARTICULAR SPECIFICALLY DISCLAIM ANY AND ALL IMPLIED WARRANTIES OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY, AND FITNESS FOR A PARTICULAR PURPOSE. FURTHERMORE, ORACLE AND ITS AFFILIATES DO NOT REPRESENT THAT ANY CUSTOMARY SECURITY REVIEW HAS BEEN PERFORMED WITH RESPECT TO ANY SOFTWARE, MATERIAL OR CONTENT CONTAINED OR PRODUCED WITHIN THIS REPOSITORY. IN ADDITION, AND WITHOUT LIMITING THE FOREGOING, THIRD PARTIES MAY HAVE POSTED SOFTWARE, MATERIAL OR CONTENT TO THIS REPOSITORY WITHOUT ANY REVIEW. USE AT YOUR OWN RISK.
44+
45+
Details:
46+
${{ steps.analysis.outputs.disclaimer_details }}
47+
repo-token: ${{ secrets.GITHUB_TOKEN }}
3648
- name: Comment if analysis finds missing readme
3749
if: steps.analysis.outputs.readme_file_found == 'false'
3850
uses: mshick/add-pr-comment@v1
@@ -72,4 +84,6 @@ jobs:
7284
- name: Halt pipeline if LICENSE is missing
7385
if: steps.analysis.outputs.license_file_found == 'false'
7486
run: exit 1
75-
87+
- name: Halt pipeline if disclaimer is missing
88+
if: steps.analysis.outputs.disclaimer_found == 'false'
89+
run: exit 1

‎cloud-foundation/modules/cloud-foundation-library/database/adw_data_safe/main.tf

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
# # Copyright © 2022, Oracle and/or its affiliates.
2+
# # All rights reserved. Licensed under the Universal Permissive License (UPL), Version 1.0 as shown at https://oss.oracle.com/licenses/upl.
3+
4+
resource "oci_database_autonomous_database" "adw" {
5+
for_each = {
6+
for k,v in var.adw_params : k => v if v.compartment_id != ""
7+
}
8+
admin_password = each.value.database_admin_password
9+
compartment_id = each.value.compartment_id
10+
cpu_core_count = each.value.adw_cpu_core_count
11+
data_storage_size_in_tbs = each.value.adw_size_in_tbs
12+
db_name = each.value.adw_db_name
13+
display_name = each.value.adw_db_name
14+
db_workload = each.value.adw_db_workload
15+
db_version = each.value.adw_db_version
16+
is_auto_scaling_enabled = each.value.adw_enable_auto_scaling
17+
is_free_tier = each.value.adw_is_free_tier
18+
license_model = each.value.adw_license_model
19+
data_safe_status = each.value.data_safe_status
20+
subnet_id = each.value.subnet_id
21+
nsg_ids = each.value.nsg_ids
22+
defined_tags = each.value.defined_tags
23+
}
24+
25+
resource "oci_database_autonomous_database_wallet" "autonomous_data_warehouse_wallet" {
26+
for_each = var.adw_params
27+
autonomous_database_id = oci_database_autonomous_database.adw[each.key].id
28+
password = each.value.database_wallet_password
29+
base64_encode_content = true
30+
}
31+

‎cloud-foundation/modules/cloud-foundation-library/database/adw_data_safe/outputs.tf

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# # Copyright © 2022, Oracle and/or its affiliates.
2+
# # All rights reserved. Licensed under the Universal Permissive License (UPL), Version 1.0 as shown at https://oss.oracle.com/licenses/upl.
3+
4+
output "ADW_Service_Console_URL" {
5+
value = join(", ", [for x in oci_database_autonomous_database.adw : x.service_console_url])
6+
}
7+
8+
output "adw" {
9+
value = {
10+
for adw in oci_database_autonomous_database.adw:
11+
adw.display_name => adw.id
12+
}
13+
}

‎cloud-foundation/modules/cloud-foundation-library/database/adw_data_safe/variables.tf

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
# # Copyright © 2022, Oracle and/or its affiliates.
2+
# # All rights reserved. Licensed under the Universal Permissive License (UPL), Version 1.0 as shown at https://oss.oracle.com/licenses/upl.
3+
4+
variable "adw_params" {
5+
type = map(object({
6+
compartment_id = string
7+
adw_cpu_core_count = number
8+
adw_size_in_tbs = number
9+
adw_db_name = string
10+
adw_db_workload = string
11+
adw_db_version = string
12+
adw_enable_auto_scaling = bool
13+
adw_is_free_tier = bool
14+
adw_license_model = string
15+
data_safe_status = string
16+
database_admin_password = string
17+
database_wallet_password = string
18+
subnet_id = string
19+
nsg_ids = list(string)
20+
defined_tags = map(string)
21+
}))
22+
}
23+
24+
25+
26+
27+
28+

‎cloud-foundation/modules/cloud-foundation-library/oci_data_safe/main.tf

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
## Copyright © 2022, Oracle and/or its affiliates.
2+
## All rights reserved. The Universal Permissive License (UPL), Version 1.0 as shown at http://oss.oracle.com/licenses/upl
3+
4+
resource "oci_data_safe_data_safe_private_endpoint" "this" {
5+
for_each = var.oci_data_safe_private_endpoint_params
6+
compartment_id = each.value.compartment_id
7+
display_name = each.value.display_name
8+
subnet_id = each.value.subnet_id
9+
vcn_id = each.value.vcn_id
10+
defined_tags = each.value.defined_tags
11+
description = each.value.description
12+
nsg_ids = each.value.nsg_ids
13+
}

‎cloud-foundation/modules/cloud-foundation-library/oci_data_safe/outputs.tf

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
## Copyright © 2022, Oracle and/or its affiliates.
2+
## All rights reserved. The Universal Permissive License (UPL), Version 1.0 as shown at http://oss.oracle.com/licenses/upl
3+
4+
output "data_safe_private_endpoint" {
5+
value = {for b in oci_data_safe_data_safe_private_endpoint.this:
6+
b.display_name => b.id}
7+
}
8+

‎cloud-foundation/modules/cloud-foundation-library/oci_data_safe/variables.tf

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
## Copyright © 2022, Oracle and/or its affiliates.
2+
## All rights reserved. The Universal Permissive License (UPL), Version 1.0 as shown at http://oss.oracle.com/licenses/upl
3+
4+
variable "oci_data_safe_private_endpoint_params" {
5+
type = map(object({
6+
compartment_id = string
7+
display_name = string
8+
description = string
9+
vcn_id = string
10+
subnet_id = string
11+
nsg_ids = list(string)
12+
defined_tags = map(string)
13+
}))
14+
}

‎cloud-foundation/modules/cloud-foundation-library/oci_log_analytics/main.tf

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# Copyright © 2022, Oracle and/or its affiliates.
2+
# All rights reserved. Licensed under the Universal Permissive License (UPL), Version 1.0 as shown at https://oss.oracle.com/licenses/upl.
3+
4+
data "oci_identity_tenancy" "this" {
5+
tenancy_id = var.tenancy_ocid
6+
}
7+
8+
resource "oci_log_analytics_log_analytics_log_group" "this" {
9+
for_each = var.log_analytics_log_group_params
10+
compartment_id = each.value.compartment_id
11+
display_name = each.value.display_name
12+
namespace = data.oci_identity_tenancy.this.name
13+
}
14+

‎cloud-foundation/modules/cloud-foundation-library/oci_log_analytics/outputs.tf

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# Copyright © 2022, Oracle and/or its affiliates.
2+
# All rights reserved. Licensed under the Universal Permissive License (UPL), Version 1.0 as shown at https://oss.oracle.com/licenses/upl.
3+
4+
output "log_analytics_log_group" {
5+
value = {for sc in oci_log_analytics_log_analytics_log_group.this:
6+
sc.display_name => sc.id}
7+
}

‎cloud-foundation/modules/cloud-foundation-library/oci_log_analytics/variables.tf

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# Copyright © 2022, Oracle and/or its affiliates.
2+
# All rights reserved. Licensed under the Universal Permissive License (UPL), Version 1.0 as shown at https://oss.oracle.com/licenses/upl.
3+
4+
variable "tenancy_ocid" {
5+
type = string
6+
}
7+
8+
variable "log_analytics_log_group_params" {
9+
type = map(object({
10+
compartment_id = string
11+
display_name = string
12+
}))
13+
}
14+

0 commit comments

Comments
 (0)