Skip to content

Commit 6c1904a

Browse files
alenonalenon
committed
Added create version command
1 parent 5616e2b commit 6c1904a

File tree

13 files changed

+564
-9
lines changed

13 files changed

+564
-9
lines changed

‎application/app/auth/app_details.go‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
package auth
2+
3+
import "github.com/jfrog/jfrog-client-go/auth"
4+
5+
type appDetails struct {
6+
auth.CommonConfigFields
7+
}
8+
9+
func NewAppDetails() auth.ServiceDetails {
10+
return &appDetails{}
11+
}
12+
13+
func (rt *appDetails) GetVersion() (string, error) {
14+
panic("Failed: Method is not implemented")
15+
}

‎application/app/context.go‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
package app
2+
3+
import (
4+
"github.com/jfrog/jfrog-cli-application/application/service"
5+
)
6+
7+
type Context interface {
8+
GetVersionService() service.VersionService
9+
GetSystemService() service.SystemService
10+
GetConfig() interface{}
11+
}
12+
13+
type context struct {
14+
versionService service.VersionService
15+
systemService service.SystemService
16+
}
17+
18+
func NewAppContext() Context {
19+
return &context{
20+
versionService: service.NewVersionService(),
21+
systemService: service.NewSystemService(),
22+
}
23+
}
24+
25+
func (c *context) GetVersionService() service.VersionService {
26+
return c.versionService
27+
}
28+
29+
func (c *context) GetSystemService() service.SystemService {
30+
return c.systemService
31+
}
32+
33+
func (c *context) GetConfig() interface{} {
34+
return nil
35+
}

‎application/cli/cli.go‎

Lines changed: 31 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,43 @@
11
package cli
22

33
import (
4+
"github.com/jfrog/jfrog-cli-application/application/app"
5+
"github.com/jfrog/jfrog-cli-application/application/commands/system"
6+
"github.com/jfrog/jfrog-cli-application/application/commands/version"
47
"github.com/jfrog/jfrog-cli-core/v2/plugins/components"
58
)
69

710
const category = "Application Lifecycle"
811

12+
//
13+
//func GetJfrogApplicationCli() components.App {
14+
// appContext := app.NewAppContext()
15+
// appEntity := components.CreateEmbeddedApp(
16+
// category,
17+
// nil,
18+
// components.Namespace{
19+
// Name: "app",
20+
// Description: "Tools for Application Lifecycle management",
21+
// Category: category,
22+
// Commands: []components.Command{
23+
// system.GetPingCommand(appContext),
24+
// version.GetCreateAppVersionCommand(appContext),
25+
// },
26+
// },
27+
// )
28+
// return appEntity
29+
//}
30+
931
func GetJfrogApplicationCli() components.App {
10-
app := components.CreateEmbeddedApp(
11-
category,
12-
nil,
13-
components.Namespace{
14-
Name: "app",
15-
Description: "Tools for Application Lifecycle management",
16-
Category: category,
17-
Commands: []components.Command{},
32+
appContext := app.NewAppContext()
33+
appEntity := components.CreateApp(
34+
"app",
35+
"1.0.0",
36+
"JFrog Application CLI",
37+
[]components.Command{
38+
system.GetPingCommand(appContext),
39+
version.GetCreateAppVersionCommand(appContext),
1840
},
1941
)
20-
return app
42+
return appEntity
2143
}

‎application/commands/flags.go‎

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
package commands
2+
3+
import pluginsCommon "github.com/jfrog/jfrog-cli-core/v2/plugins/common"
4+
import "github.com/jfrog/jfrog-cli-core/v2/plugins/components"
5+
6+
const (
7+
Ping = "ping"
8+
CreateAppVersion = "create-app-version"
9+
)
10+
11+
const (
12+
ServerId = "server-id"
13+
url = "url"
14+
user = "user"
15+
accessToken = "access-token"
16+
ProjectFlag = "project"
17+
18+
ApplicationKeyFlag = "app"
19+
PackageTypeFlag = "package-type"
20+
PackageNameFlag = "package-name"
21+
PackageVersionFlag = "package-version"
22+
PackageRepositoryFlag = "package-repository"
23+
)
24+
25+
// Flag keys mapped to their corresponding components.Flag definition.
26+
var flagsMap = map[string]components.Flag{
27+
// Common commands flags
28+
ServerId: components.NewStringFlag(ServerId, "Server ID configured using the config command.", func(f *components.StringFlag) { f.Mandatory = false }),
29+
url: components.NewStringFlag(url, "JFrog Platform URL.", func(f *components.StringFlag) { f.Mandatory = false }),
30+
user: components.NewStringFlag(user, "JFrog username.", func(f *components.StringFlag) { f.Mandatory = false }),
31+
accessToken: components.NewStringFlag(accessToken, "JFrog access token.", func(f *components.StringFlag) { f.Mandatory = false }),
32+
ProjectFlag: components.NewStringFlag(ProjectFlag, "Project key associated with the created evidence.", func(f *components.StringFlag) { f.Mandatory = false }),
33+
34+
ApplicationKeyFlag: components.NewStringFlag(ApplicationKeyFlag, "Application key.", func(f *components.StringFlag) { f.Mandatory = true }),
35+
PackageTypeFlag: components.NewStringFlag(PackageTypeFlag, "Package type.", func(f *components.StringFlag) { f.Mandatory = false }),
36+
PackageNameFlag: components.NewStringFlag(PackageNameFlag, "Package name.", func(f *components.StringFlag) { f.Mandatory = false }),
37+
PackageVersionFlag: components.NewStringFlag(PackageVersionFlag, "Package version.", func(f *components.StringFlag) { f.Mandatory = false }),
38+
PackageRepositoryFlag: components.NewStringFlag(PackageRepositoryFlag, "Package storing repository.", func(f *components.StringFlag) { f.Mandatory = false }),
39+
}
40+
41+
var commandFlags = map[string][]string{
42+
CreateAppVersion: {
43+
url,
44+
user,
45+
accessToken,
46+
ServerId,
47+
ProjectFlag,
48+
ApplicationKeyFlag,
49+
PackageTypeFlag,
50+
PackageNameFlag,
51+
PackageVersionFlag,
52+
PackageRepositoryFlag,
53+
},
54+
55+
Ping: {
56+
url,
57+
user,
58+
accessToken,
59+
ServerId,
60+
},
61+
}
62+
63+
func GetCommandFlags(cmdKey string) []components.Flag {
64+
return pluginsCommon.GetCommandFlags(cmdKey, commandFlags, flagsMap)
65+
}

‎application/commands/system/ping_cmd.go‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
package system
2+
3+
import (
4+
"github.com/jfrog/jfrog-cli-application/application/app"
5+
"github.com/jfrog/jfrog-cli-application/application/commands"
6+
"github.com/jfrog/jfrog-cli-application/application/commands/utils"
7+
"github.com/jfrog/jfrog-cli-application/application/common"
8+
"github.com/jfrog/jfrog-cli-application/application/service"
9+
commonCLiCommands "github.com/jfrog/jfrog-cli-core/v2/common/commands"
10+
"github.com/jfrog/jfrog-cli-core/v2/plugins/components"
11+
coreConfig "github.com/jfrog/jfrog-cli-core/v2/utils/config"
12+
)
13+
14+
type pingCommand struct {
15+
systemService service.SystemService
16+
serverDetails *coreConfig.ServerDetails
17+
}
18+
19+
func (pc *pingCommand) Run() error {
20+
ctx := &service.Context{ServerDetails: pc.serverDetails}
21+
return pc.systemService.Ping(ctx)
22+
}
23+
24+
func (pc *pingCommand) ServerDetails() (*coreConfig.ServerDetails, error) {
25+
return pc.serverDetails, nil
26+
}
27+
28+
func (pc *pingCommand) CommandName() string {
29+
return commands.Ping
30+
}
31+
32+
func (pc *pingCommand) prepareAndRunCommand(ctx *components.Context) error {
33+
serverDetails, err := utils.ServerDetailsByFlags(ctx)
34+
if err != nil {
35+
return err
36+
}
37+
pc.serverDetails = serverDetails
38+
return commonCLiCommands.Exec(pc)
39+
}
40+
41+
func GetPingCommand(appContext app.Context) components.Command {
42+
cmd := &pingCommand{systemService: appContext.GetSystemService()}
43+
return components.Command{
44+
Name: commands.Ping,
45+
Description: "Ping the application server",
46+
Category: common.CategorySystem,
47+
Aliases: []string{"p"},
48+
Arguments: []components.Argument{},
49+
Flags: commands.GetCommandFlags(commands.Ping),
50+
Action: cmd.prepareAndRunCommand,
51+
}
52+
}

‎application/commands/utils/utils.go‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
package utils
2+
3+
import (
4+
"fmt"
5+
commonCliUtils "github.com/jfrog/jfrog-cli-core/v2/common/cliutils"
6+
pluginsCommon "github.com/jfrog/jfrog-cli-core/v2/plugins/common"
7+
"github.com/jfrog/jfrog-cli-core/v2/plugins/components"
8+
coreConfig "github.com/jfrog/jfrog-cli-core/v2/utils/config"
9+
"github.com/jfrog/jfrog-client-go/utils"
10+
"github.com/jfrog/jfrog-client-go/utils/errorutils"
11+
)
12+
13+
func AssertValueProvided(c *components.Context, fieldName string) error {
14+
if c.GetStringFlagValue(fieldName) == "" {
15+
return errorutils.CheckErrorf("the --%s option is mandatory", fieldName)
16+
}
17+
return nil
18+
}
19+
20+
func PlatformToApplicationUrls(details *coreConfig.ServerDetails) {
21+
details.ArtifactoryUrl = utils.AddTrailingSlashIfNeeded(details.Url) + "artifactory/"
22+
details.EvidenceUrl = utils.AddTrailingSlashIfNeeded(details.Url) + "evidence/"
23+
details.MetadataUrl = utils.AddTrailingSlashIfNeeded(details.Url) + "metadata/"
24+
}
25+
26+
func ServerDetailsByFlags(ctx *components.Context) (*coreConfig.ServerDetails, error) {
27+
serverDetails, err := pluginsCommon.CreateServerDetailsWithConfigOffer(ctx, true, commonCliUtils.Platform)
28+
if err != nil {
29+
return nil, err
30+
}
31+
if serverDetails.Url == "" {
32+
return nil, fmt.Errorf("platform URL is mandatory for evidence commands")
33+
}
34+
if serverDetails.GetUser() != "" && serverDetails.GetPassword() != "" {
35+
return nil, fmt.Errorf("evidence service does not support basic authentication")
36+
}
37+
38+
return serverDetails, nil
39+
}

‎application/commands/version/create_app_version_cmd.go‎

Lines changed: 103 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,103 @@
1+
package version
2+
3+
import (
4+
"github.com/jfrog/jfrog-cli-application/application/app"
5+
"github.com/jfrog/jfrog-cli-application/application/commands"
6+
"github.com/jfrog/jfrog-cli-application/application/commands/utils"
7+
"github.com/jfrog/jfrog-cli-application/application/common"
8+
"github.com/jfrog/jfrog-cli-application/application/model"
9+
"github.com/jfrog/jfrog-cli-application/application/service"
10+
commonCLiCommands "github.com/jfrog/jfrog-cli-core/v2/common/commands"
11+
pluginsCommon "github.com/jfrog/jfrog-cli-core/v2/plugins/common"
12+
"github.com/jfrog/jfrog-cli-core/v2/plugins/components"
13+
coreConfig "github.com/jfrog/jfrog-cli-core/v2/utils/config"
14+
)
15+
16+
type createAppVersionCommand struct {
17+
versionService service.VersionService
18+
serverDetails *coreConfig.ServerDetails
19+
requestPayload *model.CreateAppVersionRequest
20+
}
21+
22+
func (cv *createAppVersionCommand) Run() error {
23+
ctx := &service.Context{ServerDetails: cv.serverDetails}
24+
return cv.versionService.CreateAppVersion(ctx, cv.requestPayload)
25+
}
26+
27+
func (cv *createAppVersionCommand) ServerDetails() (*coreConfig.ServerDetails, error) {
28+
return cv.serverDetails, nil
29+
}
30+
31+
func (cv *createAppVersionCommand) CommandName() string {
32+
return commands.CreateAppVersion
33+
}
34+
35+
func (cv *createAppVersionCommand) prepareAndRunCommand(ctx *components.Context) error {
36+
if err := validateCreateAppVersionContext(ctx); err != nil {
37+
return err
38+
}
39+
serverDetails, err := utils.ServerDetailsByFlags(ctx)
40+
if err != nil {
41+
return err
42+
}
43+
cv.serverDetails = serverDetails
44+
cv.requestPayload = cv.buildRequestPayload(ctx)
45+
return commonCLiCommands.Exec(cv)
46+
}
47+
48+
func (cv *createAppVersionCommand) buildRequestPayload(ctx *components.Context) *model.CreateAppVersionRequest {
49+
packages := []model.CreateVersionPackage{
50+
{
51+
Type: ctx.GetStringFlagValue(commands.PackageTypeFlag),
52+
Name: ctx.GetStringFlagValue(commands.PackageNameFlag),
53+
Version: ctx.GetStringFlagValue(commands.PackageVersionFlag),
54+
Repository: ctx.GetStringFlagValue(commands.PackageRepositoryFlag),
55+
},
56+
}
57+
58+
return &model.CreateAppVersionRequest{
59+
ApplicationKey: ctx.GetStringFlagValue(commands.ApplicationKeyFlag),
60+
Version: ctx.Arguments[0],
61+
Packages: packages,
62+
}
63+
}
64+
65+
func validateCreateAppVersionContext(ctx *components.Context) error {
66+
if show, err := pluginsCommon.ShowCmdHelpIfNeeded(ctx, ctx.Arguments); show || err != nil {
67+
return err
68+
}
69+
if len(ctx.Arguments) > 1 {
70+
return pluginsCommon.WrongNumberOfArgumentsHandler(ctx)
71+
}
72+
73+
return nil
74+
//err := utils.AssertValueProvided(ctx, commands.PackageNameFlag)
75+
//if err != nil {
76+
// return err
77+
//}
78+
//err = utils.AssertValueProvided(ctx, commands.PackageVersionFlag)
79+
//if err != nil {
80+
// return err
81+
//}
82+
//err = utils.AssertValueProvided(ctx, commands.PackageRepositoryFlag)
83+
//return err
84+
}
85+
86+
func GetCreateAppVersionCommand(appContext app.Context) components.Command {
87+
cmd := &createAppVersionCommand{versionService: appContext.GetVersionService()}
88+
return components.Command{
89+
Name: commands.CreateAppVersion,
90+
Description: "Create application version",
91+
Category: common.CategoryVersion,
92+
Aliases: []string{"cav"},
93+
Arguments: []components.Argument{
94+
{
95+
Name: "version-name",
96+
Description: "The name of the version",
97+
Optional: false,
98+
},
99+
},
100+
Flags: commands.GetCommandFlags(commands.CreateAppVersion),
101+
Action: cmd.prepareAndRunCommand,
102+
}
103+
}

‎application/common/categories.go‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
package common
2+
3+
const (
4+
CategorySystem = "system"
5+
CategoryVersion = "version"
6+
)

0 commit comments

Comments
 (0)