Skip to content

Commit

Permalink
Merge pull request #4 from ehl-jf/feature/WKS-928-rename-go-module
Browse files Browse the repository at this point in the history
Rename module to jfrog-cli-platform-services
  • Loading branch information
RemiBou authored May 15, 2024
2 parents db029d8 + f5223a2 commit 13d332b
Show file tree
Hide file tree
Showing 24 changed files with 31 additions and 31 deletions.
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Welcome to the contribution guide for our project! We appreciate your interest i
To run a command locally, use the following command template:

```sh
go run github.com/jfrog/workers-cli command [options] [arguments...]
go run github.com/jfrog/jfrog-cli-platform-services command [options] [arguments...]
```

---
Expand Down
4 changes: 2 additions & 2 deletions PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
- [ ] The pull request is targeting the `main` branch.
- [ ] The code has been validated to compile successfully by running `go vet ./...`.
- [ ] The code has been formatted properly using `go fmt ./...`.
- [ ] All [static analysis checks](https://github.com/jfrog/workers-cli/actions/workflows/analysis.yml) passed.
- [ ] All [tests](https://github.com/jfrog/workers-cli/actions/workflows/unit-tests.yml) have passed. If this feature is not already covered by the tests, new tests have been added.
- [ ] All [static analysis checks](https://github.com/jfrog/jfrog-cli-platform-services/actions/workflows/analysis.yml) passed.
- [ ] All [tests](https://github.com/jfrog/jfrog-cli-platform-services/actions/workflows/unit-tests.yml) have passed. If this feature is not already covered by the tests, new tests have been added.
- [ ] All changes are detailed at the description. if not already covered at [JFrog Documentation](https://github.com/jfrog/documentation), new documentation have been added.

-----
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
<div align="center">

# jfrog-workers-cli
# jfrog-cli-platform-services
[![Scanned by Frogbot](https://raw.github.com/jfrog/frogbot/master/images/frogbot-badge.svg)](https://github.com/jfrog/frogbot#readme)

</div>

| Branch | Status |
|:------:|:--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------:|
| main | [![Test](https://github.com/jfrog/workers-cli/actions/workflows/unit-tests.yml/badge.svg?branch=main)](https://github.com/jfrog/workers-cli/actions/workflows/unit-tests.yml?query=branch%main) [![Static Analysis](https://github.com/jfrog/workers-cli/actions/workflows/analysis.yml/badge.svg?branch=main)](https://github.com/jfrog/workers-cli/actions/workflows/analysis.yml) |
| main | [![Test](https://github.com/jfrog/jfrog-cli-platform-services/actions/workflows/unit-tests.yml/badge.svg?branch=main)](https://github.com/jfrog/jfrog-cli-platform-services/actions/workflows/unit-tests.yml?query=branch%main) [![Static Analysis](https://github.com/jfrog/jfrog-cli-platform-services/actions/workflows/analysis.yml/badge.svg?branch=main)](https://github.com/jfrog/jfrog-cli-platform-services/actions/workflows/analysis.yml) |

## General

**jfrog-workers-cli** is a Go module that enable jfrog workers commands in the [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).
**jfrog-cli-platform-services** is a Go module that enable jfrog workers commands in the [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

Expand Down
8 changes: 4 additions & 4 deletions cli/cli.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,19 @@ package cli

import (
"github.com/jfrog/jfrog-cli-core/v2/plugins/components"
"github.com/jfrog/workers-cli/commands"
"github.com/jfrog/jfrog-cli-platform-services/commands"
)

func GetApp() components.App {
func GetWorkerApp() components.App {
app := components.App{}
app.Name = "worker"
app.Description = "Tools for managing workers"
app.Version = "v1.0.0"
app.Commands = getCommands()
app.Commands = getWorkerCommands()
return app
}

func getCommands() []components.Command {
func getWorkerCommands() []components.Command {
return []components.Command{
commands.GetInitCommand(),
commands.GetDryRunCommand(),
Expand Down
2 changes: 1 addition & 1 deletion commands/add_secret_cmd.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"github.com/jfrog/jfrog-cli-core/v2/utils/ioutils"
"github.com/jfrog/jfrog-client-go/utils/log"

"github.com/jfrog/workers-cli/model"
"github.com/jfrog/jfrog-cli-platform-services/model"
)

type addSecretCommand struct {
Expand Down
2 changes: 1 addition & 1 deletion commands/add_secret_cmd_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

"github.com/jfrog/workers-cli/model"
"github.com/jfrog/jfrog-cli-platform-services/model"
)

type addSecretAssertFunc func(t *testing.T, manifestBefore, manifestAfter *model.Manifest)
Expand Down
2 changes: 1 addition & 1 deletion commands/commands_commons.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"github.com/jfrog/jfrog-client-go/utils"
"github.com/jfrog/jfrog-client-go/utils/log"

"github.com/jfrog/workers-cli/model"
"github.com/jfrog/jfrog-cli-platform-services/model"
)

// Useful to capture output in tests
Expand Down
2 changes: 1 addition & 1 deletion commands/commands_commons_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (

"github.com/stretchr/testify/require"

"github.com/jfrog/workers-cli/model"
"github.com/jfrog/jfrog-cli-platform-services/model"
)

const secretPassword = "P@ssw0rd!"
Expand Down
2 changes: 1 addition & 1 deletion commands/deploy_cmd.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"github.com/jfrog/jfrog-cli-core/v2/plugins/components"
"github.com/jfrog/jfrog-client-go/utils/log"

"github.com/jfrog/workers-cli/model"
"github.com/jfrog/jfrog-cli-platform-services/model"
)

type deployRequest struct {
Expand Down
2 changes: 1 addition & 1 deletion commands/deploy_cmd_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

"github.com/jfrog/workers-cli/model"
"github.com/jfrog/jfrog-cli-platform-services/model"
)

func TestDeployCommand(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion commands/dry_run_cmd.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
plugins_common "github.com/jfrog/jfrog-cli-core/v2/plugins/common"
"github.com/jfrog/jfrog-cli-core/v2/plugins/components"

"github.com/jfrog/workers-cli/model"
"github.com/jfrog/jfrog-cli-platform-services/model"
)

type dryRunHandler struct {
Expand Down
2 changes: 1 addition & 1 deletion commands/dry_run_cmd_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

"github.com/jfrog/workers-cli/model"
"github.com/jfrog/jfrog-cli-platform-services/model"
)

type dryRunAssertFunc func(t *testing.T, stdOutput []byte, err error, serverBehavior *dryRunServerStubBehavior)
Expand Down
2 changes: 1 addition & 1 deletion commands/execute_cmd.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
plugins_common "github.com/jfrog/jfrog-cli-core/v2/plugins/common"
"github.com/jfrog/jfrog-cli-core/v2/plugins/components"

"github.com/jfrog/workers-cli/model"
"github.com/jfrog/jfrog-cli-platform-services/model"
)

func GetExecuteCommand() components.Command {
Expand Down
2 changes: 1 addition & 1 deletion commands/execute_cmd_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

"github.com/jfrog/workers-cli/model"
"github.com/jfrog/jfrog-cli-platform-services/model"
)

type executeAssertFunc func(t *testing.T, stdOutput []byte, err error, serverBehavior *executeServerStubBehavior)
Expand Down
2 changes: 1 addition & 1 deletion commands/init_cmd.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"strings"
"text/template"

"github.com/jfrog/workers-cli/model"
"github.com/jfrog/jfrog-cli-platform-services/model"

"github.com/jfrog/jfrog-cli-core/v2/plugins/components"
"github.com/jfrog/jfrog-client-go/utils/log"
Expand Down
2 changes: 1 addition & 1 deletion commands/init_cmd_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"strings"
"testing"

"github.com/jfrog/workers-cli/model"
"github.com/jfrog/jfrog-cli-platform-services/model"

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
Expand Down
2 changes: 1 addition & 1 deletion commands/list_cmd.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"github.com/jfrog/jfrog-cli-core/v2/plugins/components"
"github.com/jfrog/jfrog-client-go/utils/log"

"github.com/jfrog/workers-cli/model"
"github.com/jfrog/jfrog-cli-platform-services/model"
)

type getAllResponse struct {
Expand Down
2 changes: 1 addition & 1 deletion commands/list_cmd_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

"github.com/jfrog/workers-cli/model"
"github.com/jfrog/jfrog-cli-platform-services/model"
)

func TestListCommand(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion commands/list_event_cmd.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
plugins_common "github.com/jfrog/jfrog-cli-core/v2/plugins/common"
"github.com/jfrog/jfrog-cli-core/v2/plugins/components"

"github.com/jfrog/workers-cli/model"
"github.com/jfrog/jfrog-cli-platform-services/model"
)

func GetListEventsCommand() components.Command {
Expand Down
2 changes: 1 addition & 1 deletion commands/list_event_cmd_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

"github.com/jfrog/workers-cli/model"
"github.com/jfrog/jfrog-cli-platform-services/model"
)

func TestListEventCommand(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion commands/remove_cmd.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"github.com/jfrog/jfrog-cli-core/v2/plugins/components"
"github.com/jfrog/jfrog-client-go/utils/log"

"github.com/jfrog/workers-cli/model"
"github.com/jfrog/jfrog-cli-platform-services/model"
)

func GetRemoveCommand() components.Command {
Expand Down
2 changes: 1 addition & 1 deletion commands/remove_cmd_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

"github.com/jfrog/workers-cli/model"
"github.com/jfrog/jfrog-cli-platform-services/model"
)

func TestRemoveCommand(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/jfrog/workers-cli
module github.com/jfrog/jfrog-cli-platform-services

require (
github.com/jfrog/jfrog-cli-core/v2 v2.51.0
Expand Down
4 changes: 2 additions & 2 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ package main

import (
"github.com/jfrog/jfrog-cli-core/v2/plugins"
"github.com/jfrog/workers-cli/cli"
"github.com/jfrog/jfrog-cli-platform-services/cli"
)

func main() {
plugins.PluginMain(cli.GetApp())
plugins.PluginMain(cli.GetWorkerApp())
}

0 comments on commit 13d332b

Please sign in to comment.