Skip to content

Commit 6d0357d

Browse files
alisyed-19alisyed-19
authored
Merge pull request #925 from oracle/feature/PDPDEVTOOL-6106-bump-node-cli-version
feature/pdpdevtool-6106: bump node cli version and add missing master files
2 parents 1e641e7 + 4bde110 commit 6d0357d

File tree

6 files changed

+305
-1
lines changed

6 files changed

+305
-1
lines changed

‎.github/ISSUE_TEMPLATE/---contribution-request.yml

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
name: Contribution Request
2+
description: Request for contributing to the repository
3+
body:
4+
- type: markdown
5+
attributes:
6+
value: |
7+
Thank you for your interest in contributing to our project! To proceed with your contribution request, please fill out the details below. This will help us better understand your proposal and provide you with the necessary guidance.
8+
9+
---
10+
- type: input
11+
id: contact-email
12+
attributes:
13+
label: Contact Email
14+
description: Your email address for us to reach out, if needed.
15+
placeholder: "[email protected]"
16+
validations:
17+
required: false
18+
- type: dropdown
19+
id: contribution-type
20+
attributes:
21+
label: Type of Contribution
22+
options:
23+
- Bug Fix
24+
- Feature Request
25+
- Documentation Improvement
26+
- Code Enhancement
27+
- Other
28+
validations:
29+
required: true
30+
- type: dropdown
31+
id: product
32+
attributes:
33+
label: Product
34+
description: Select the product for which you want to make a contribution.
35+
options:
36+
- SuiteCloud CLI
37+
- SuiteCloud Extension for VSCode
38+
- SuiteCloud Unit Testing
39+
- Other
40+
validations:
41+
required: true
42+
- type: textarea
43+
id: contribution-description
44+
attributes:
45+
label: Contribution Description
46+
description: Please describe the contribution you would like to make.
47+
placeholder: "Describe your idea or proposal in detail."
48+
validations:
49+
required: true
50+
- type: input
51+
id: prerequisites-acknowledgment
52+
attributes:
53+
label: Prerequisites
54+
description: |
55+
Please confirm that you have reviewed our contributing guidelines and registered in the Oracle system for contributions.
56+
placeholder: "Yes, I have completed the prerequisites."
57+
validations:
58+
required: true
59+
- type: textarea
60+
id: additional-information
61+
attributes:
62+
label: Additional Information
63+
description: |
64+
Any additional information or context you'd like to share regarding your contribution request. You can also include links to relevant resources or documentation.
65+
validations:
66+
required: false

‎.github/ISSUE_TEMPLATE/bug-report.yml

Lines changed: 106 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
1+
name: Bug
2+
description: File a bug report
3+
body:
4+
- type: markdown
5+
attributes:
6+
value: |
7+
Before opening a bug report, please search for the behaviour in the existing issues. If this is regarding NS functionality, please report to NS customer Support Serivce.
8+
9+
---
10+
11+
Thank you for taking the time to file a bug report. To address this bug as fast as possible, we need some information.
12+
- type: dropdown
13+
id: tool
14+
attributes:
15+
label: Select the SuiteCloud tool where you encountered the issue
16+
options:
17+
- SuiteCloud CLI
18+
- SuiteCloud Extension for VSCode
19+
- SuiteCloud Unit Testing
20+
validations:
21+
required: true
22+
- type: input
23+
id: toolVersion
24+
attributes:
25+
label: Version of the SuiteCloud Tool
26+
description: |
27+
For CLI run: `suitecloud --version`
28+
29+
For VSCode Extension: `ctrl+shift+x` , search for suitecloud extension, Check the Version in front of Extension Name (Not in the description below)
30+
31+
For Unit-Testing package: Open package.json from your suitecloud project, check the version on "@oracle/suitecloud-unit-testing": ^1.2.1"
32+
placeholder: "1.2.0"
33+
validations:
34+
required: true
35+
- type: input
36+
id: os
37+
attributes:
38+
label: Operating system
39+
description: "Which operating system do you use? Please provide the version as well."
40+
placeholder: "macOS Big Sur 11.5.2"
41+
validations:
42+
required: true
43+
- type: input
44+
id: Node
45+
attributes:
46+
label: Node Version / VSCode Version
47+
description: |
48+
Please provide the full Node version of your project. node -v
49+
OR
50+
Please provide VSCODE version in case you selected SuiteCloud Extension. This can be checked in "About Visual Studio Code".
51+
placeholder: "v18.15.0, 1.78.0 (Universal)"
52+
validations:
53+
required: true
54+
- type: input
55+
id: java
56+
attributes:
57+
label: JAVA Version
58+
description: "Please provide the full Java version. java --full-version"
59+
placeholder: "java version '17.0.6 2023-01-17 LTS'"
60+
validations:
61+
required: true
62+
- type: textarea
63+
id: bug-description
64+
attributes:
65+
label: Bug description
66+
description: What happened?
67+
validations:
68+
required: true
69+
- type: textarea
70+
attributes:
71+
label: Steps To Reproduce
72+
description: Steps to reproduce the behavior.
73+
placeholder: |
74+
1. when running suitecloud account:setup ...
75+
2. creating a new authid
76+
3. Browser based authentication
77+
4. See error...
78+
validations:
79+
required: true
80+
- type: textarea
81+
attributes:
82+
label: Actual Output
83+
description: |
84+
Please provide the actual result/output
85+
86+
Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
87+
validations:
88+
required: false
89+
- type: textarea
90+
attributes:
91+
label: Expected Output
92+
description: |
93+
Please provide the expected result/output
94+
95+
Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
96+
validations:
97+
required: false
98+
- type: textarea
99+
attributes:
100+
label: Anything else?
101+
description: |
102+
Links? References? Anything that will give us more context about the issue you are encountering!
103+
104+
Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
105+
validations:
106+
required: false

‎.github/ISSUE_TEMPLATE/config.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
blank_issues_enabled: false

‎CONTRIBUTING.md

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
# Contributing to this repository
2+
3+
We welcome your contributions! There are multiple ways to contribute.
4+
5+
## Opening issues
6+
7+
For bugs or enhancement requests, please file a GitHub issue unless it's
8+
security related. When filing a bug remember that the better written the bug is,
9+
the more likely it is to be fixed. If you think you've found a security
10+
vulnerability, do not raise a GitHub issue and follow the instructions in our
11+
[security policy](./SECURITY.md).
12+
13+
## Contributing code
14+
15+
We welcome your code contributions. Before submitting code via a pull request,
16+
you will need to have signed the [Oracle Contributor Agreement][OCA] (OCA) and
17+
your commits need to include the following line using the name and e-mail
18+
address you used to sign the OCA:
19+
20+
```text
21+
Signed-off-by: Your Name <[email protected]>
22+
```
23+
24+
This can be automatically added to pull requests by committing with `--sign-off`
25+
or `-s`, e.g.
26+
27+
```text
28+
git commit --signoff
29+
```
30+
31+
Only pull requests from committers that can be verified as having signed the OCA
32+
can be accepted.
33+
34+
## Pull request process
35+
36+
1. Ensure there is an issue created to track and discuss the fix or enhancement
37+
you intend to submit.
38+
1. Fork this repository.
39+
1. Create a branch in your fork to implement the changes. We recommend using
40+
the issue number as part of your branch name, e.g. `1234-fixes`.
41+
1. Ensure that any documentation is updated with the changes that are required
42+
by your change.
43+
1. Ensure that any samples are updated if the base image has been changed.
44+
1. Submit the pull request. *Do not leave the pull request blank*. Explain exactly
45+
what your changes are meant to do and provide simple steps on how to validate.
46+
your changes. Ensure that you reference the issue you created as well.
47+
1. We will assign the pull request to 2-3 people for review before it is merged.
48+
49+
## Code of conduct
50+
51+
Follow the [Golden Rule](https://en.wikipedia.org/wiki/Golden_Rule). If you'd
52+
like more specific guidelines, see the [Contributor Covenant Code of Conduct][COC].
53+
54+
[OCA]: https://oca.opensource.oracle.com
55+
[COC]: https://www.contributor-covenant.org/version/1/4/code-of-conduct/

‎packages/node-cli/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@oracle/suitecloud-cli",
3-
"version": "3.0.1",
3+
"version": "3.0.2",
44
"license": "UPL-1.0",
55
"description": "SuiteCloud CLI for Node.js",
66
"keywords": [

‎sbom_generation.yaml

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
# Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
2+
3+
# This OCI DevOps build specification file [1] generates a Software Bill of Materials (SBOM) of the repository.
4+
# It is required for third-party vulnerability checks and business approval under Oracle’s GitHub policies.
5+
# [1] https://docs.oracle.com/en-us/iaas/Content/devops/using/build_specs.htm
6+
7+
version: 0.1
8+
component: build
9+
timeoutInSeconds: 1000
10+
shell: bash
11+
12+
steps:
13+
- type: Command
14+
name: "Install Node.js 22 and matching npm"
15+
command: |
16+
curl -fsSL https://rpm.nodesource.com/setup_22.x | bash -
17+
yum install -y nodejs
18+
node -v
19+
npm -v
20+
21+
- type: Command
22+
name: "Install node-cli & unit-testing packages"
23+
command: |
24+
rm -f package-lock.json
25+
npm install --ignore-scripts
26+
27+
- type: Command
28+
name: "Install CycloneDX as dependency"
29+
command: |
30+
npm install --ignore-scripts
31+
npm install --save-dev @cyclonedx/[email protected] --ignore-scripts
32+
33+
34+
- type: Command
35+
name: "Run CycloneDX for node-cli & unit-testing packages"
36+
command: |
37+
npx @cyclonedx/cyclonedx-npm \
38+
--omit dev \
39+
--output-format JSON \
40+
--output-file artifactSBOM_node-cli_unit-testing.json \
41+
--spec-version 1.4
42+
43+
- type: Command
44+
name: "Install vscode extension package"
45+
command: |
46+
cd packages/vscode-extension
47+
rm -f package-lock.json
48+
npm install --ignore-scripts
49+
50+
- type: Command
51+
name: "Run CycloneDX for vscode-extension package"
52+
command: |
53+
cd packages/vscode-extension
54+
npx @cyclonedx/cyclonedx-npm \
55+
--omit dev \
56+
--output-format JSON \
57+
--output-file artifactSBOM_vscode-extension.json \
58+
--spec-version 1.4
59+
60+
- type: Command
61+
name: "Download CycloneDX Linux CLI and install dependencies"
62+
command: |
63+
wget -O cyclonedx-linux-x64 https://github.com/CycloneDX/cyclonedx-cli/releases/download/v0.24.2/cyclonedx-linux-x64
64+
chmod +x cyclonedx-linux-x64
65+
yum install -y libicu
66+
67+
- type: Command
68+
name: "Merge multiple SBOMs using CycloneDX-linux-cli"
69+
command: |
70+
# For more details, visit https://github.com/CycloneDX/cyclonedx-cli/blob/main/README.md
71+
chmod +x cyclonedx-linux-x64
72+
./cyclonedx-linux-x64 merge --input-files artifactSBOM_node-cli_unit-testing.json packages/vscode-extension/artifactSBOM_vscode-extension.json --output-file artifactSBOM.json
73+
outputArtifacts:
74+
- name: artifactSBOM
75+
type: BINARY
76+
location: ${OCI_PRIMARY_SOURCE_DIR}/artifactSBOM.json

0 commit comments

Comments
 (0)