Skip to content

Commit 13a6146

Browse files
Richard87satr
Richard87
and
satr
authored
154 vulnerability scans accessible through api or grafana (#115)
* move the generated api client to new folder * Add vulnscanapi * Rename GetForCommand to GetRadixApiForCommand for clarity * refactor client for different endpoints * refactor client for different endpoints * Add vulnerability command to retrieve scan results for applications * Update cmd/getVulnerability.go Co-authored-by: Sergey Smolnikov <[email protected]> * Fix error handling in getVulnerability.go for improved clarity * Update cmd/getVulnerability.go Co-authored-by: Sergey Smolnikov <[email protected]> * Enhance getVulnerability.go to support job and component detection for vulnerability scans * Refactor getVulnerability.go to enhance job and component detection for vulnerability scans * Refactor getVulnerability.go to update component model references for improved clarity * remove quoted names --------- Co-authored-by: Sergey Smolnikov <[email protected]>
1 parent 24bb9ee commit 13a6146

File tree

351 files changed

+3495
-1891
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

351 files changed

+3495
-1891
lines changed

‎Makefile

+4-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,10 @@ RELEASE_NOTE ?= "First release"
44

55
.PHONY: swagger
66
swagger: bootstrap
7-
swagger generate client -t ./generated-client -f https://api.radix.equinor.com/swaggerui/swagger.json -A radixapi
7+
mkdir -p ./generated/radixapi
8+
mkdir -p ./generated/vulnscanapi
9+
swagger generate client -t ./generated/radixapi -f https://api.radix.equinor.com/swaggerui/swagger.json -A radixapi
10+
swagger generate client -t ./generated/vulnscanapi -f https://server-radix-vulnerability-scanner-api-prod.radix.equinor.com/swaggerui/swagger.json -A vulnscanapi
811

912
.PHONY: push
1013
push:

‎cmd/createApplication.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ import (
2020
"strings"
2121
"time"
2222

23-
"github.com/equinor/radix-cli/generated-client/client/application"
24-
"github.com/equinor/radix-cli/generated-client/client/platform"
25-
"github.com/equinor/radix-cli/generated-client/models"
23+
"github.com/equinor/radix-cli/generated/radixapi/client/application"
24+
"github.com/equinor/radix-cli/generated/radixapi/client/platform"
25+
"github.com/equinor/radix-cli/generated/radixapi/models"
2626
"github.com/equinor/radix-cli/pkg/client"
2727
"github.com/equinor/radix-cli/pkg/config"
2828
"github.com/equinor/radix-cli/pkg/flagnames"
@@ -76,7 +76,7 @@ var createApplicationCmd = &cobra.Command{
7676
},
7777
})
7878

79-
apiClient, err := client.GetForCommand(cmd)
79+
apiClient, err := client.GetRadixApiForCommand(cmd)
8080
if err != nil {
8181
return err
8282
}

‎cmd/createApplyConfigPipelineJob.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ package cmd
1717
import (
1818
"errors"
1919

20-
"github.com/equinor/radix-cli/generated-client/client/application"
21-
"github.com/equinor/radix-cli/generated-client/models"
20+
"github.com/equinor/radix-cli/generated/radixapi/client/application"
21+
"github.com/equinor/radix-cli/generated/radixapi/models"
2222
"github.com/equinor/radix-cli/pkg/client"
2323
"github.com/equinor/radix-cli/pkg/config"
2424
"github.com/equinor/radix-cli/pkg/flagnames"
@@ -66,7 +66,7 @@ By default it applies changes to properties DNS alias, build secrets, and create
6666

6767
cmd.SilenceUsage = true
6868

69-
apiClient, err := client.GetForCommand(cmd)
69+
apiClient, err := client.GetRadixApiForCommand(cmd)
7070
if err != nil {
7171
return err
7272
}

‎cmd/createBuildDeployPipelineJob.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ package cmd
1717
import (
1818
"errors"
1919

20+
"github.com/equinor/radix-cli/generated/radixapi/client/application"
21+
"github.com/equinor/radix-cli/generated/radixapi/models"
2022
"github.com/equinor/radix-cli/pkg/config"
2123
"github.com/equinor/radix-cli/pkg/model"
2224
"github.com/equinor/radix-cli/pkg/utils/completion"
2325
log "github.com/sirupsen/logrus"
2426

25-
"github.com/equinor/radix-cli/generated-client/client/application"
26-
"github.com/equinor/radix-cli/generated-client/models"
2727
"github.com/equinor/radix-cli/pkg/client"
2828
"github.com/equinor/radix-cli/pkg/flagnames"
2929
"github.com/spf13/cobra"
@@ -69,7 +69,7 @@ var createBuildDeployApplicationCmd = &cobra.Command{
6969

7070
cmd.SilenceUsage = true
7171

72-
apiClient, err := client.GetForCommand(cmd)
72+
apiClient, err := client.GetRadixApiForCommand(cmd)
7373
if err != nil {
7474
return err
7575
}

‎cmd/createBuildPipelineJob.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ package cmd
1717
import (
1818
"errors"
1919

20-
"github.com/equinor/radix-cli/generated-client/client/application"
21-
"github.com/equinor/radix-cli/generated-client/models"
20+
"github.com/equinor/radix-cli/generated/radixapi/client/application"
21+
"github.com/equinor/radix-cli/generated/radixapi/models"
2222
"github.com/equinor/radix-cli/pkg/client"
2323
"github.com/equinor/radix-cli/pkg/config"
2424
"github.com/equinor/radix-cli/pkg/flagnames"
@@ -61,7 +61,7 @@ var createBuildPipelineJobCmd = &cobra.Command{
6161

6262
cmd.SilenceUsage = true
6363

64-
apiClient, err := client.GetForCommand(cmd)
64+
apiClient, err := client.GetRadixApiForCommand(cmd)
6565
if err != nil {
6666
return err
6767
}

‎cmd/createDeployPipelineJob.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ import (
1919
"fmt"
2020
"regexp"
2121

22+
"github.com/equinor/radix-cli/generated/radixapi/client/application"
23+
"github.com/equinor/radix-cli/generated/radixapi/models"
2224
"github.com/equinor/radix-cli/pkg/config"
2325
"github.com/equinor/radix-cli/pkg/utils/completion"
2426
log "github.com/sirupsen/logrus"
2527

26-
"github.com/equinor/radix-cli/generated-client/client/application"
27-
"github.com/equinor/radix-cli/generated-client/models"
2828
"github.com/equinor/radix-cli/pkg/client"
2929
"github.com/equinor/radix-cli/pkg/flagnames"
3030
"github.com/spf13/cobra"
@@ -88,7 +88,7 @@ var createDeployPipelineJobCmd = &cobra.Command{
8888

8989
cmd.SilenceUsage = true
9090

91-
apiClient, err := client.GetForCommand(cmd)
91+
apiClient, err := client.GetRadixApiForCommand(cmd)
9292
if err != nil {
9393
return err
9494
}

‎cmd/createEnvironment.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ package cmd
1717
import (
1818
"errors"
1919

20-
"github.com/equinor/radix-cli/generated-client/client/environment"
20+
"github.com/equinor/radix-cli/generated/radixapi/client/environment"
2121
"github.com/equinor/radix-cli/pkg/client"
2222
"github.com/equinor/radix-cli/pkg/config"
2323
"github.com/equinor/radix-cli/pkg/flagnames"
@@ -48,7 +48,7 @@ var createEnvironmentCmd = &cobra.Command{
4848
WithAppName(appName).
4949
WithEnvName(envName)
5050

51-
apiClient, err := client.GetForCommand(cmd)
51+
apiClient, err := client.GetRadixApiForCommand(cmd)
5252
if err != nil {
5353
return err
5454
}

‎cmd/createPromotePipelineJob.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@ import (
1818
"errors"
1919
"fmt"
2020

21-
apiclient "github.com/equinor/radix-cli/generated-client/client"
22-
"github.com/equinor/radix-cli/generated-client/client/environment"
21+
radixapi "github.com/equinor/radix-cli/generated/radixapi/client"
22+
"github.com/equinor/radix-cli/generated/radixapi/client/application"
23+
"github.com/equinor/radix-cli/generated/radixapi/client/environment"
24+
"github.com/equinor/radix-cli/generated/radixapi/models"
2325
"github.com/equinor/radix-cli/pkg/config"
2426
"github.com/equinor/radix-cli/pkg/utils/completion"
2527

2628
log "github.com/sirupsen/logrus"
2729

28-
"github.com/equinor/radix-cli/generated-client/client/application"
29-
"github.com/equinor/radix-cli/generated-client/models"
3030
"github.com/equinor/radix-cli/pkg/client"
3131
"github.com/equinor/radix-cli/pkg/flagnames"
3232
"github.com/spf13/cobra"
@@ -63,7 +63,7 @@ var createPromotePipelineJobCmd = &cobra.Command{
6363

6464
cmd.SilenceUsage = true
6565

66-
apiClient, err := client.GetForCommand(cmd)
66+
apiClient, err := client.GetRadixApiForCommand(cmd)
6767
if err != nil {
6868
return err
6969
}
@@ -101,7 +101,7 @@ var createPromotePipelineJobCmd = &cobra.Command{
101101
},
102102
}
103103

104-
func getActiveDeploymentName(apiClient *apiclient.Radixapi, appName, envName string) (string, error) {
104+
func getActiveDeploymentName(apiClient *radixapi.Radixapi, appName, envName string) (string, error) {
105105
params := environment.NewGetEnvironmentParams()
106106
params.SetAppName(appName)
107107
params.SetEnvName(envName)

‎cmd/deleteApplication.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ package cmd
1717
import (
1818
"errors"
1919

20-
"github.com/equinor/radix-cli/generated-client/client/application"
20+
"github.com/equinor/radix-cli/generated/radixapi/client/application"
2121
"github.com/equinor/radix-cli/pkg/client"
2222
"github.com/equinor/radix-cli/pkg/config"
2323
"github.com/equinor/radix-cli/pkg/flagnames"
@@ -45,7 +45,7 @@ var deleteApplicationCmd = &cobra.Command{
4545
deleteApplicationParams := application.NewDeleteApplicationParams()
4646
deleteApplicationParams.SetAppName(appName)
4747

48-
apiClient, err := client.GetForCommand(cmd)
48+
apiClient, err := client.GetRadixApiForCommand(cmd)
4949
if err != nil {
5050
return err
5151
}

‎cmd/deleteEnvironment.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ package cmd
1717
import (
1818
"errors"
1919

20-
"github.com/equinor/radix-cli/generated-client/client/environment"
20+
"github.com/equinor/radix-cli/generated/radixapi/client/environment"
2121
"github.com/equinor/radix-cli/pkg/client"
2222
"github.com/equinor/radix-cli/pkg/config"
2323
"github.com/equinor/radix-cli/pkg/flagnames"
@@ -48,7 +48,7 @@ var deleteEnvironmentCmd = &cobra.Command{
4848
WithAppName(appName).
4949
WithEnvName(envName)
5050

51-
apiClient, err := client.GetForCommand(cmd)
51+
apiClient, err := client.GetRadixApiForCommand(cmd)
5252
if err != nil {
5353
return err
5454
}

‎cmd/getApplication.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ package cmd
1717
import (
1818
"fmt"
1919

20-
"github.com/equinor/radix-cli/generated-client/client/application"
21-
"github.com/equinor/radix-cli/generated-client/client/platform"
20+
"github.com/equinor/radix-cli/generated/radixapi/client/application"
21+
"github.com/equinor/radix-cli/generated/radixapi/client/platform"
2222
"github.com/equinor/radix-cli/pkg/client"
2323
"github.com/equinor/radix-cli/pkg/config"
2424
"github.com/equinor/radix-cli/pkg/flagnames"
@@ -40,7 +40,7 @@ var getApplicationCmd = &cobra.Command{
4040

4141
cmd.SilenceUsage = true
4242

43-
apiClient, err := client.GetForCommand(cmd)
43+
apiClient, err := client.GetRadixApiForCommand(cmd)
4444
if err != nil {
4545
return err
4646
}

‎cmd/getDeployment.go

+8-8
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@ import (
1818
"errors"
1919
"fmt"
2020

21-
apiclient "github.com/equinor/radix-cli/generated-client/client"
22-
"github.com/equinor/radix-cli/generated-client/client/application"
23-
"github.com/equinor/radix-cli/generated-client/client/environment"
21+
radixapi "github.com/equinor/radix-cli/generated/radixapi/client"
22+
"github.com/equinor/radix-cli/generated/radixapi/client/application"
23+
"github.com/equinor/radix-cli/generated/radixapi/client/deployment"
24+
"github.com/equinor/radix-cli/generated/radixapi/client/environment"
2425
"github.com/equinor/radix-cli/pkg/config"
2526
"github.com/equinor/radix-cli/pkg/flagnames"
2627
"github.com/equinor/radix-cli/pkg/utils/completion"
2728
"github.com/equinor/radix-cli/pkg/utils/json"
2829

29-
"github.com/equinor/radix-cli/generated-client/client/deployment"
3030
"github.com/equinor/radix-cli/pkg/client"
3131
"github.com/spf13/cobra"
3232
)
@@ -70,7 +70,7 @@ Examples:
7070

7171
cmd.SilenceUsage = true
7272

73-
apiClient, err := client.GetForCommand(cmd)
73+
apiClient, err := client.GetRadixApiForCommand(cmd)
7474
if err != nil {
7575
return err
7676
}
@@ -85,7 +85,7 @@ Examples:
8585
},
8686
}
8787

88-
func getDeployment(apiClient *apiclient.Radixapi, appName, deploymentName string) error {
88+
func getDeployment(apiClient *radixapi.Radixapi, appName, deploymentName string) error {
8989
params := deployment.NewGetDeploymentParams()
9090
params.WithAppName(appName)
9191
if deploymentName != "" {
@@ -103,7 +103,7 @@ func getDeployment(apiClient *apiclient.Radixapi, appName, deploymentName string
103103
return nil
104104
}
105105

106-
func getDeploymentForAllEnvironments(apiClient *apiclient.Radixapi, appName string) error {
106+
func getDeploymentForAllEnvironments(apiClient *radixapi.Radixapi, appName string) error {
107107
params := application.NewGetDeploymentsParams()
108108
params.WithAppName(appName)
109109
resp, err := apiClient.Application.GetDeployments(params, nil)
@@ -118,7 +118,7 @@ func getDeploymentForAllEnvironments(apiClient *apiclient.Radixapi, appName stri
118118
return nil
119119
}
120120

121-
func getDeploymentForEnvironment(apiClient *apiclient.Radixapi, appName, envName string) error {
121+
func getDeploymentForEnvironment(apiClient *radixapi.Radixapi, appName, envName string) error {
122122
params := environment.NewGetApplicationEnvironmentDeploymentsParams()
123123
params.WithAppName(appName)
124124
params.WithEnvName(envName)

0 commit comments

Comments
 (0)