Skip to content

Commit f49cd8b

Browse files
Ej4z4KEj4z4K
authored
Merge branch 'main' into review_291024
2 parents 84a511a + 87a216c commit f49cd8b

File tree

26 files changed

+190
-78
lines changed

26 files changed

+190
-78
lines changed

‎.github/workflows/banned_file_changes_pr.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ on:
33
# pull_request:
44
# branches: [ "**/*" ]
55
pull_request_target:
6-
6+
77
jobs:
88
check_for_banned_file_changes:
99
name: Look for unsupported (banned) file modifications on PRs
@@ -31,7 +31,7 @@ jobs:
3131
echo 'Changes to files in .github are not allowed.'
3232
- name: Comment if .github changed
3333
if: contains(steps.files.outputs.all_files_changed, '.github')
34-
uses: oracle-devrel/add-pr-comment@v1
34+
uses: oracle-devrel/add-pr-comment
3535
with:
3636
message: |
3737
:no_entry: **Banned Files Modified**
@@ -43,15 +43,15 @@ jobs:
4343
echo 'Changes to license_policy.yml are not allowed.'
4444
- name: Comment if license_policy.yml changed
4545
if: contains(steps.files.outputs.all_files_changed, '"license_policy.yml"')
46-
uses: oracle-devrel/add-pr-comment@v1
46+
uses: oracle-devrel/add-pr-comment
4747
with:
4848
message: |
4949
:no_entry: **Banned Files Modified**
5050
Changes to `license_policy.yml` are not permitted. Please revert your changes and re-submit a new PR. Simply changing the file back to its original state and re-committing won't work (you must revert the changes made to it).
5151
repo-token: ${{ secrets.GITHUB_TOKEN }}
5252
- name: Look for changes to repolinter.json
5353
if: contains(steps.files.outputs.all_files_changed, '"repolinter.json"')
54-
uses: oracle-devrel/add-pr-comment@v1
54+
uses: oracle-devrel/add-pr-comment
5555
with:
5656
message: |
5757
:no_entry: **Banned Files Modified**
@@ -63,7 +63,7 @@ jobs:
6363
echo 'Changes to repolinter.json are not allowed.'
6464
- name: Look for changes to sonar-project.properties
6565
if: contains(steps.files.outputs.all_files_changed, '"sonar-project.properties"')
66-
uses: oracle-devrel/add-pr-comment@v1
66+
uses: oracle-devrel/add-pr-comment
6767
with:
6868
message: |
6969
:no_entry: **Banned Files Modified**

‎.github/workflows/license_audit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
run: echo "${{ steps.analysis.outputs.unapproved_licenses }}"
3232
- name: Comment if analysis finds unapproved licenses
3333
if: steps.analysis.outputs.unapproved_licenses == 'true'
34-
uses: oracle-devrel/add-pr-comment@v1
34+
uses: oracle-devrel/add-pr-comment
3535
with:
3636
message: |
3737
:no_entry: **License Inspection**

‎.github/workflows/repolinter.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
echo "Errored: ${{ steps.analysis.outputs.errored }}"
3535
- name: Comment if analysis finds missing disclaimer
3636
if: steps.analysis.outputs.disclaimer_found == 'false'
37-
uses: oracle-devrel/add-pr-comment@v1
37+
uses: oracle-devrel/add-pr-comment
3838
with:
3939
message: |
4040
:no_entry: **FAILURE: Missing Disclaimer**
@@ -47,34 +47,34 @@ jobs:
4747
repo-token: ${{ secrets.GITHUB_TOKEN }}
4848
- name: Comment if analysis finds missing readme
4949
if: steps.analysis.outputs.readme_file_found == 'false'
50-
uses: oracle-devrel/add-pr-comment@v1
50+
uses: oracle-devrel/add-pr-comment
5151
with:
5252
message: |
5353
:no_entry: **FAILURE: Missing README**
5454
The README file seems to be missing. Please add it.
55-
55+
5656
Details:
5757
${{ steps.analysis.outputs.readme_file_details }}
5858
repo-token: ${{ secrets.GITHUB_TOKEN }}
5959
- name: Comment if analysis finds missing license
6060
if: steps.analysis.outputs.license_file_found == 'false'
61-
uses: oracle-devrel/add-pr-comment@v1
61+
uses: oracle-devrel/add-pr-comment
6262
with:
6363
message: |
6464
:no_entry: **FAILURE: Missing LICENSE**
6565
The LICENSE file seems to be missing. Please add it.
66-
66+
6767
Details:
6868
${{ steps.analysis.outputs.license_file_details }}
6969
repo-token: ${{ secrets.GITHUB_TOKEN }}
7070
- name: Comment if analysis finds copyright notice missing
7171
if: steps.analysis.outputs.copyright_found == 'false'
72-
uses: oracle-devrel/add-pr-comment@v1
72+
uses: oracle-devrel/add-pr-comment
7373
with:
7474
message: |
7575
:warning: **WARNING: Missing Copyright Notice(s)**
7676
It's a good idea to have copyright notices at the top of each file. It looks like at least one file was missing this (though it might be further down in the file - this might be a false-positive).
77-
77+
7878
Details:
7979
${{ steps.analysis.outputs.copyright_details }}
8080
repo-token: ${{ secrets.GITHUB_TOKEN }}

‎app-dev/devops-and-containers/devops/azure-devops-oke/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ curl 144.200.51.195
176176

177177
# Useful Links
178178

179-
- [Oracle Kubernetes Engine (OKE)](https://www.oracle.com/uk/cloud/cloud-native/kubernetes-engine/)
179+
- [Oracle Kubernetes Engine (OKE)](https://www.oracle.com/cloud/cloud-native/kubernetes-engine/)
180180
- Simplify operations of enterprise-grade Kubernetes at scale. Easily deploy and manage resource-intensive workloads such as AI with automatic scaling, patching, and upgrades.
181181
- [Oracle](https://www.oracle.com/)
182182
- Oracle Website

‎app-dev/devops-and-containers/devops/devops-nodejs-vm/LICENSE

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
Copyright (c) 2024 Oracle and/or its affiliates.
2+
3+
The Universal Permissive License (UPL), Version 1.0
4+
5+
Subject to the condition set forth below, permission is hereby granted to any
6+
person obtaining a copy of this software, associated documentation and/or data
7+
(collectively the "Software"), free of charge and under any and all copyright
8+
rights in the Software, and any and all patent rights owned or freely
9+
licensable by each licensor hereunder covering either (i) the unmodified
10+
Software as contributed to or provided by such licensor, or (ii) the Larger
11+
Works (as defined below), to deal in both
12+
13+
(a) the Software, and
14+
(b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
15+
one is included with the Software (each a "Larger Work" to which the Software
16+
is contributed by such licensors),
17+
18+
without restriction, including without limitation the rights to copy, create
19+
derivative works of, display, perform, and distribute the Software and make,
20+
use, sell, offer for sale, import, export, have made, and have sold the
21+
Software and the Larger Work(s), and to sublicense the foregoing rights on
22+
either these or other terms.
23+
24+
This license is subject to the following condition:
25+
The above copyright notice and either this complete permission notice or at
26+
a minimum a reference to the UPL must be included in all copies or
27+
substantial portions of the Software.
28+
29+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
30+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
31+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
32+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
33+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
34+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
35+
SOFTWARE.

‎app-dev/devops-and-containers/oci-queue/example-usage/README.md

Lines changed: 57 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,62 @@
1-
# OCI Queue Example usage
2-
3-
TEXT
4-
5-
Author: [mikarinneoracle](https://github.com/mikarinneoracle)
6-
7-
Reviewed: 08.05.2024
1+
<!--
2+
Copyright (c) 2024 Oracle and/or its affiliates.
83
4+
The Universal Permissive License (UPL), Version 1.0
5+
6+
Subject to the condition set forth below, permission is hereby granted to any
7+
person obtaining a copy of this software, associated documentation and/or data
8+
(collectively the "Software"), free of charge and under any and all copyright
9+
rights in the Software, and any and all patent rights owned or freely
10+
licensable by each licensor hereunder covering either (i) the unmodified
11+
Software as contributed to or provided by such licensor, or (ii) the Larger
12+
Works (as defined below), to deal in both
13+
14+
(a) the Software, and
15+
(b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
16+
one is included with the Software (each a "Larger Work" to which the Software
17+
is contributed by such licensors),
18+
19+
without restriction, including without limitation the rights to copy, create
20+
derivative works of, display, perform, and distribute the Software and make,
21+
use, sell, offer for sale, import, export, have made, and have sold the
22+
Software and the Larger Work(s), and to sublicense the foregoing rights on
23+
either these or other terms.
24+
25+
This license is subject to the following condition:
26+
The above copyright notice and either this complete permission notice or at
27+
a minimum a reference to the UPL must be included in all copies or
28+
substantial portions of the Software.
29+
30+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
31+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
32+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
33+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
34+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
35+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
36+
SOFTWARE.
37+
-->
38+
39+
# OCI Queue example
40+
41+
Reviewed: 30.10.2024
42+
943
# When to use this asset?
44+
45+
Anyone who wants to test OCI Queue service using OCI SDK in JavaScript and do this from GitHub Actions.
1046

11-
# How to use this asset?
47+
# Author
48+
<a href="https://github.com/mikarinneoracle">mikarinneoracle</a>
1249

13-
## OCI Queue
50+
# How to use this asset?
1451

15-
Create Queue and copy the Queue <i>OCID</i> and <i>Messages endpoint</i>:
52+
In the OCI cloud UI create OCI Queue and copy the Queue <i>OCID</i> and <i>Messages endpoint</i>:
1653

1754
<p>
1855
<img src="files/endpoint.png" width="800" />
1956

2057
<p>
2158
When using another <code>region</code> than <code>EU_FRANKFURT_1</code> please modify the
22-
<a href="index.js#L48">
59+
<a href="files/index.js#L48">
2360
<code>index.js</code></a> Line #48 accordingly:
2461

2562
<pre>
@@ -64,7 +101,7 @@ This example will poll for messages in the queue and finally writes a new messag
64101

65102
## Running locally
66103

67-
Clone this repo, setup npm and <code>oci cli</code> and modify <a href="index.js#L46">index.js</a> line 46 by uncommenting it and removing/commenting lines 49-56 and replace lines 59-60
104+
Clone this repo, setup npm and <code>oci cli</code> and modify <a href="files/index.js#L46">index.js</a> line 46 by uncommenting it and removing/commenting lines 49-56 and replace lines 59-60
68105
with Queue details :
69106

70107
<pre>
@@ -91,7 +128,14 @@ You can manually send messages to the queue using the OCI Queue Console
91128
<p>
92129
You can also play with the queue's <code>Dead Letter Queue</code> settings to see how many
93130
times the same message is being received (default is 5). To do this comment the
94-
<a href="index.js#L99">line 99 of the index.js</a> and re-run the build by committing the change.
131+
<a href="files/index.js#L99">line 99 of the index.js</a> and re-run the build by committing the change.
132+
133+
# Useful Links
134+
135+
- [OCI Queue](https://www.oracle.com/cloud/queue/)
136+
- A Serverless Messaging Service
137+
- [Oracle](https://www.oracle.com/)
138+
- Oracle Website
95139

96140
# License
97141

@@ -100,5 +144,3 @@ Copyright (c) 2024 Oracle and/or its affiliates.
100144
Licensed under the Universal Permissive License (UPL), Version 1.0.
101145

102146
See [LICENSE](https://github.com/oracle-devrel/technology-engineering/blob/main/LICENSE) for more details.
103-
104-

‎app-dev/devops-and-containers/oke/atp-operator-nodejs/LICENSE

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
Copyright (c) 2024 Oracle and/or its affiliates.
2+
3+
The Universal Permissive License (UPL), Version 1.0
4+
5+
Subject to the condition set forth below, permission is hereby granted to any
6+
person obtaining a copy of this software, associated documentation and/or data
7+
(collectively the "Software"), free of charge and under any and all copyright
8+
rights in the Software, and any and all patent rights owned or freely
9+
licensable by each licensor hereunder covering either (i) the unmodified
10+
Software as contributed to or provided by such licensor, or (ii) the Larger
11+
Works (as defined below), to deal in both
12+
13+
(a) the Software, and
14+
(b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
15+
one is included with the Software (each a "Larger Work" to which the Software
16+
is contributed by such licensors),
17+
18+
without restriction, including without limitation the rights to copy, create
19+
derivative works of, display, perform, and distribute the Software and make,
20+
use, sell, offer for sale, import, export, have made, and have sold the
21+
Software and the Larger Work(s), and to sublicense the foregoing rights on
22+
either these or other terms.
23+
24+
This license is subject to the following condition:
25+
The above copyright notice and either this complete permission notice or at
26+
a minimum a reference to the UPL must be included in all copies or
27+
substantial portions of the Software.
28+
29+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
30+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
31+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
32+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
33+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
34+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
35+
SOFTWARE.
36+

‎app-dev/devops-and-containers/oke/atp-operator-nodejs/README.md

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,19 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
3636
SOFTWARE.
3737
-->
3838

39-
### Author
39+
# Easy Oracle Autonomous DB access for NodeJS with Kubernetes Operator
40+
41+
Reviewed: 30.10.2024
42+
43+
# When to use this asset?
44+
45+
Anyone who wants to manage Oracle Autonomous Database with Kubernetes Operator.
46+
The code example is for NodeJS but should be rather similar also for PHP and Java, for example.
47+
48+
# Author
4049
<a href="https://github.com/mikarinneoracle">mikarinneoracle</a>
4150

42-
### Blog on Medium
51+
# How to use this asset?
4352

4453
Please see the <a href="https://medium.com/@mika.rinne/easy-oracle-autonomous-db-access-for-nodejs-with-kubernetes-operator-cf02ea7fc59a">blog on Medium</a>.
4554

‎app-dev/devops-and-containers/oke/atp-operator-nodejs/atp.yaml renamed to ‎app-dev/devops-and-containers/oke/atp-operator-nodejs/files/atp.yaml

File renamed without changes.

‎app-dev/devops-and-containers/oke/atp-operator-nodejs/nodejs.yaml renamed to ‎app-dev/devops-and-containers/oke/atp-operator-nodejs/files/nodejs.yaml

File renamed without changes.

0 commit comments

Comments
 (0)