Skip to content

Commit

Permalink
Merge branch 'dev' into analyzer-manager-intergation-test
Browse files Browse the repository at this point in the history
  • Loading branch information
eyalbe4 authored Jul 20, 2023
2 parents 5fca540 + 7e6b04f commit 1df234e
Show file tree
Hide file tree
Showing 90 changed files with 2,012 additions and 971 deletions.
11 changes: 6 additions & 5 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
- [ ] All [tests](https://github.com/jfrog/jfrog-cli#tests) passed. If this feature is not already covered by the tests, I added new tests.
- [ ] All [static analysis checks](https://github.com/jfrog/jfrog-cli/actions/workflows/analysis.yml) passed.
- [ ] This pull request is on the dev branch.
- [ ] I used gofmt for formatting the code before submitting the pull request.
-----
- [ ] All [tests](https://github.com/jfrog/jfrog-cli/CONTRIBUTING.md#tests) have passed. If this feature is not already covered by the tests, new tests have been added.
- [ ] The pull request is targeting the `dev` branch.
- [ ] The code has been validated to compile successfully by running `go vet ./...`.
- [ ] The code has been formatted properly using `go fmt ./...`.

---
7 changes: 5 additions & 2 deletions .github/workflows/analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ jobs:
restore-keys: ${{ runner.os }}-go
- name: Run Go vet
run: go vet -v ./...

Static-Check:
name: Static Check ubuntu-latest
runs-on: ubuntu-latest
Expand All @@ -45,9 +46,11 @@ jobs:
with:
go-version: 1.20.x
- name: Static Code Analysis
uses: dominikh/staticcheck-action@v1
uses: golangci/golangci-lint-action@v3
with:
install-go: false
args: |
--timeout 5m --out-${NO_FUTURE}format colored-line-number --enable errcheck,gosimple,govet,ineffassign,staticcheck,typecheck,unused,gocritic,asasalint,asciicheck,errchkjson,exportloopref,forcetypeassert,makezero,nilerr,unparam,unconvert,wastedassign,usestdlibvars
Go-Sec:
name: Go-Sec ubuntu-latest
runs-on: ubuntu-latest
Expand Down
297 changes: 297 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,297 @@
# 📖 Guidelines

- Ensure that your changes are covered by existing tests. If not, please add new tests.
- Create pull requests on the `dev` branch.
- Before submitting the pull request, format the code by running `go fmt ./...`.
- Before submitting the pull request, ensure the code compiles by running `go vet ./...`.

# ⚒️ Building and Testing the Sources

## Building JFrog CLI

To build JFrog CLI, first, make sure Go is installed by running the following command:

```sh
go version
```

Next, clone the project sources and navigate to the root directory:

```sh
git clone https://github.com/jfrog/jfrog-cli.git
cd jfrog-cli
```

To build the sources on Unix-based systems, run:

```sh
./build/build.sh
```

On Windows, run:

```sh
.\build\build.bat
```

After the build process completes, you will find the `jf` or `jf.exe` executable in the current directory.

### Dependencies in other JFrog modules

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)
- [github.com/jfrog/build-info-go](github.com/jfrog/build-info-go)
- [github.com/jfrog/gofrog](github.com/jfrog/gofrog)

#### Local Development

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.

For instance, let's assume you wish to modify files from `jfrog-cli-core`. Clone the `jfrog-cli-core` repository (preferably your fork) to your local development machine, placing it at `/local/path/in/your/machine/jfrog-cli-core`.

To include this local dependency, 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.

#### Pull Requests

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/galusben/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.

## Tests

### Usage

To run tests, use the following command:

```
go test -v github.com/jfrog/jfrog-cli [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. |

The available test types are:

| Type | Description |
| -------------------- | ------------------ |
| `-test.artifactory` | Artifactory tests |
| `-test.access` | Access tests |
| `-test.npm` | Npm tests |
| `-test.maven` | Maven tests |
| `-test.gradle` | Gradle tests |
| `-test.docker` | Docker tests |
| `-test.dockerScan` | Docker scan tests |
| `-test.podman` | Podman tests |
| `-test.go` | Go tests |
| `-test.pip` | Pip tests |
| `-test.pipenv` | Pipenv tests |
| `-test.poetry` | Poetry tests |
| `-test.nuget` | Nuget tests |
| `-test.plugins` | Plugins tests |
| `-test.distribution` | Distribution tests |
| `-test.transfer` | Transfer tests |
| `-test.xray` | Xray 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.

#### Artifactory tests

In addition to the [general optional flags](#Usage), you can use the following optional Artifactory flags:

| Flag | Description |
| ---------------------- | --------------------------------------------------------------------------------------------------------------- |
| `-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. |

##### Examples

To run Artifactory tests, execute the following command:

```
go test -v github.com/jfrog/jfrog-cli -test.artifactory [flags]
```

#### Npm tests

##### Requirements

- The _npm_ executables should be included in the system's `PATH` environment variable.
- The tests are compatible with npm 7 and higher.

##### Limitations

- Currently, npm integration only supports HTTP(S) connections to Artifactory using username and password.

##### Examples

To run Npm tests, execute the following command:

```
go test -v github.com/jfrog/jfrog-cli -test.npm [flags]
```

#### Maven tests

##### Requirements

- The _java_ executable should be included in the system's `PATH` environment variable. Alternatively, set the `_JAVA_HOME` environment variable.

##### Limitations

- Currently, Maven integration only supports HTTP(S) connections to Artifactory using username and password.

##### Examples

To run Maven tests, execute the following command:

```
go test -v github.com/jfrog/jfrog-cli -test.maven [flags]
```

#### Gradle tests

##### Requirements

- The _gradle_ and _java_ executables should be included in the system's `PATH` environment variable. Alternatively, set the `JAVA_HOME` environment variable.

##### Limitations

- Currently, Gradle integration only supports HTTP(S) connections to Artifactory using username and password.

##### Examples

To run Gradle tests, execute the following command:

```
go test -v github.com/jfrog/jfrog-cli -test.gradle [flags]
```

#### Docker tests

##### Requirements

- Make sure the `RTLIC` environment variable is configured with a valid license.
- You can start an Artifactory container by running the `startArtifactory.sh` script located in the `testdata/docker/artifactory` directory. Before running the tests, wait for Artifactory to finish booting up in the container.

| Flag | Description |
| ------------------------- | ----------------------------------- |
| `-test.containerRegistry` | Artifactory Docker registry domain. |

##### Examples

To run Docker tests, execute the following command (replace the missing parameters as described below):

```
go test -v github.com/jfrog/jfrog-cli -test.docker [flags]
```

#### Podman tests

| Flag | Description |
| ------------------------- | -------------------------------------- |
| `-test.containerRegistry` | Artifactory container registry domain. |

##### Examples

To run Podman tests, execute the following command (replace the missing parameters as described below):

```
go test -v github.com/jfrog/jfrog-cli -test.podman [flags]
```

#### Go commands tests

#####

Requirements

- The tests are compatible with Artifactory 6.10 and higher.
- To run Go tests, use the following command:

```
go test -v github.com/jfrog/jfrog-cli -test.go [flags]
```

#### NuGet tests

##### Requirements

- Add the NuGet executable to the system's `PATH` environment variable.
- Run the following command:

```
go test -v github.com/jfrog/jfrog-cli -test.nuget [flags]
```

#### Pip tests

##### Requirements

- Add the Python and pip executables to the system's `PATH` environment variable.
- Run the following command:

```
go test -v github.com/jfrog/jfrog-cli -test.pip [flags]
```

#### Plugins tests

To run Plugins tests, execute the following command:

```
go test -v github.com/jfrog/jfrog-cli -test.plugins
```

#### Distribution tests

To run Distribution tests, execute the following command:

```
go test -v github.com/jfrog/jfrog-cli -test.distribution [flags]
```

#### Transfer tests

##### Requirement

The Transfer tests execute `transfer-files` commands between a local Artifactory server and a remote SaaS instance. In addition to the [general optional flags](#Usage), you _must_ use the following flags:

| Flag | Description |
| ---------------------------------- | -------------------------------------------------------------------------------------------------------------------------------- |
| `-jfrog.targetUrl` | JFrog target platform URL. |
| `-jfrog.targetAdminToken` | JFrog target platform admin token. |
| `-jfrog.jfrogHome` | The JFrog home directory of the local Artifactory installation. |
| `-jfrog.installDataTransferPlugin` | Set this flag to `true` if you want the test to automatically install the data-transfer plugin in the source Artifactory server. |

To run Transfer tests, execute the following command:

```
go test -v github.com/jfrog/jfrog-cli -test.transfer [flags]
```

### Xray tests

To run Xray tests, execute the following command:

```
go test -v github.com/jfrog/jfrog-cli -test.xray -test.dockerScan [flags]
```
17 changes: 5 additions & 12 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ node("docker") {
repo = 'jfrog-cli'
sh 'rm -rf temp'
sh 'mkdir temp'
def goRoot = tool 'go-1.20.4'
def goRoot = tool 'go-1.20.5'
env.GOROOT="$goRoot"
env.PATH+=":${goRoot}/bin"
env.GO111MODULE="on"
Expand Down Expand Up @@ -133,29 +133,22 @@ def runRelease(architectures) {
}
}
if (identifier == "v2") {
createTagAndRelease()
createTag()
}
}
} finally {
cleanupRepo21()
}
}

def createTagAndRelease() {
def createTag() {
stage('Create a tag and a GitHub release') {
dir("$jfrogCliRepoDir") {
releaseTag = "v$RELEASE_VERSION"
withCredentials([string(credentialsId: 'ecosystem-github-automation', variable: 'GITHUB_ACCESS_TOKEN')]) {
sh """#!/bin/bash
git tag $releaseTag
git push "https://$GITHUB_ACCESS_TOKEN@github.com/jfrog/jfrog-cli.git" --tags
curl -L \
-X POST \
-H "Accept: application/vnd.github+json" \
-H "Authorization: Bearer $GITHUB_ACCESS_TOKEN"\
-H "X-GitHub-Api-Version: 2022-11-28" \
https://api.github.com/repos/jfrog/jfrog-cli/releases \
-d '{"tag_name":"$releaseTag","target_commitish":"$BRANCH","name":"$RELEASE_VERSION","generate_release_notes":true}'
"""
}
}
Expand Down Expand Up @@ -418,9 +411,9 @@ def publishNpmPackage(jfrogCliRepoDir) {
}

def publishChocoPackageWithRetries(version, jfrogCliRepoDir, architectures) {
def maxAttempts = 3
def maxAttempts = 10
def currentAttempt = 1
def waitSeconds = 20
def waitSeconds = 18

while (currentAttempt <= maxAttempts) {
try {
Expand Down
Loading

0 comments on commit 1df234e

Please sign in to comment.