From b35967821fe41c4e667f943d62ce566080359411 Mon Sep 17 00:00:00 2001 From: attiasas Date: Mon, 22 Jan 2024 11:52:07 +0200 Subject: [PATCH] add contribution guide --- CONTRIBUTING.md | 117 ++++++++++++++++++++++++++++++++++++++++++++++++ README.md | 4 +- 2 files changed, 119 insertions(+), 2 deletions(-) create mode 100644 CONTRIBUTING.md diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 00000000..4c1c6c59 --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,117 @@ +# Contribution Guide + +## Table of Contents + +- [📖 Guidelines](#-guidelines) +- [🏠🏗️ Local development](#-local-development) +- [🚦 Running Tests](#-running-tests) + +## 📖 Guidelines + +Before submitting the pull request, ensure: + +- Your changes are covered by `unit` and `integration` tests. If not, please add new tests. +- The code compiles, by running `go vet ./...`. +- To format the code, by running `go fmt ./...`. + +When creating the pull request, ensure: + +- The pull request is on the `dev` branch. +- The pull request description describes the changes made. + +
+ +Before merging the pull request + +--- + +Once you have completed your coding changes, it is recommended to push the modifications made to the other modules first. Once these changes are pushed, you can update this project to resolve dependencies from your GitHub fork or branch. + +To achieve this, modify the `go.mod` file to point the dependency to your repository and branch, as shown in the example below: + +``` +replace github.com/jfrog/jfrog-cli-core/v2 => github.com/jfrog/jfrog-cli-core/v2 dev +``` + +Finally, execute `go mod tidy` to update the Go module files. Please note that Go will automatically update the version in the `go.mod` file. + +--- + +
+ + +## 🏠🏗️ Local Development + +To run a command locally, use the following command template: + +```sh +go run github.com/jfrog/jfrog-cli-security command [options] [arguments...] +``` + +--- + +Please review our [Plugin Contribution](https://github.com/jfrog/jfrog-cli-core/blob/dev/plugins/README.md) guide. + +This project heavily depends on the following modules: + +- [github.com/jfrog/jfrog-client-go](https://github.com/jfrog/jfrog-client-go) +- [github.com/jfrog/jfrog-cli-core](github.com/jfrog/jfrog-cli-core) + +During local development, if you come across code that needs to be modified in one of the mentioned modules, it is advisable to replace the dependency with a local clone of the module. + +To include this local dependency, For instance, let's assume you wish to modify files from `jfrog-cli-core`, modify the `go.mod` file as follows: + +``` +replace github.com/jfrog/jfrog-cli-core/v2 => /local/path/in/your/machine/jfrog-cli-core +``` + +Afterward, execute `go mod tidy` to ensure the Go module files are updated. Note that Go will automatically adjust the version in the `go.mod` file. + +## 🚦 Running Tests + +When running the tests, builds and repositories with timestamps will be created, for example: `cli-rt1-1592990748` and `cli-rt2-1592990748`. +The content of these repositories will be deleted once the tests are completed. + +To run tests, use the following command: + +``` +go test -v github.com/jfrog/jfrog-cli-security [test-types] [flags] +``` + +### The available flags are: + +| Flag | Description | +| ------------------- | ----------------------------------------------------------------------------------------------- | +| `-jfrog.url` | [Default: http://localhost:8081] JFrog platform URL | +| `-jfrog.user` | [Default: admin] JFrog platform username | +| `-jfrog.password` | [Default: password] JFrog platform password | +| `-jfrog.adminToken` | [Optional] JFrog platform admin token | +| `-ci.runId` | [Optional] A unique identifier used as a suffix to create repositories and builds in the tests. | +| `-jfrog.sshKeyPath` | [Optional] Path to the SSH key file. Use this flag only if the Artifactory URL format is `ssh://[domain]:port`. | +| `-jfrog.sshPassphrase` | [Optional] Passphrase for the SSH key. | + +--- + + +### The available test types are: + +| Type | Description | +| -------------------- | ------------------ | +| `-test.security` | [Default: true] Security commands integration tests | +| `-test.dockerScan` | [Optional] Docker scan integration tests | + +### Docker Scan tests + +
+ +#### Requirements + +- Make sure the `RTLIC` environment variable is configured with a valid license. +- Before running the tests, wait for Artifactory to finish booting up in the container. + +| Flag | Description | +| ------------------------- | ----------------------------------- | +| `-test.containerRegistry` | Artifactory Docker registry domain. | + + +
diff --git a/README.md b/README.md index 7431da36..d52a47d1 100644 --- a/README.md +++ b/README.md @@ -12,8 +12,8 @@ ## General -**jfrog-cli-security** is a Go module that encompasses the security commands of [JFrog CLI](https://docs.jfrog-applications.jfrog.io/jfrog-applications/jfrog-cli). This module is an Embedded JFrog CLI Plugins and is referenced as a Go module within the [JFrog CLI codebase](https://github.com/jfrog/jfrog-cli). +**jfrog-cli-security** is a Go module that encompasses the security commands of [JFrog CLI](https://docs.jfrog-applications.jfrog.io/jfrog-applications/jfrog-cli). This module is an Embedded JFrog CLI Plugin and is referenced as a Go module within the [JFrog CLI codebase](https://github.com/jfrog/jfrog-cli). ## 🫱🏻‍🫲🏼 Contributions -We welcome contributions from the community through pull requests. To assist in enhancing this project, please review our [Plugin Contribution](https://github.com/jfrog/jfrog-cli-core/blob/dev/plugins/README.md) guide. +We welcome contributions from the community through pull requests. To assist in enhancing this project, please review our [Contribution](CONTRIBUTING.md) guide.