Skip to content

Commit be24483

Browse files
committed
fix: Allow to use inline-scanning with on-prem installations
1 parent 29d52b7 commit be24483

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

cmd/harbor-scanner-sysdig-secure/main.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ func getAdapter() scanner.Adapter {
8080
return scanner.NewInlineAdapter(
8181
client,
8282
clientset,
83+
viper.GetString("secure_url"),
8384
viper.GetString("namespace_name"),
8485
viper.GetString("configmap_name"),
8586
viper.GetString("secret_name"))

pkg/scanner/inline_adapter.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,18 @@ import (
1919
type inlineAdapter struct {
2020
BaseAdapter
2121
k8sClient kubernetes.Interface
22+
secureURL string
2223
namespace string
2324
configMap string
2425
secret string
2526
jobTTL int32
2627
}
2728

28-
func NewInlineAdapter(secureClient secure.Client, k8sClient kubernetes.Interface, namespace string, configMap string, secret string) Adapter {
29+
func NewInlineAdapter(secureClient secure.Client, k8sClient kubernetes.Interface, secureURL string, namespace string, configMap string, secret string) Adapter {
2930
return &inlineAdapter{
3031
BaseAdapter: BaseAdapter{secureClient: secureClient},
3132
k8sClient: k8sClient,
33+
secureURL: secureURL,
3234
namespace: namespace,
3335
configMap: configMap,
3436
secret: secret,
@@ -100,7 +102,7 @@ func (i *inlineAdapter) buildJob(req harbor.ScanRequest) *batchv1.Job {
100102
Command: []string{"/bin/bash"},
101103
Args: []string{
102104
"-c",
103-
fmt.Sprintf("docker login harbor.sysdig-demo.zone -u '$(HARBOR_ROBOTACCOUNT_USER)' -p '$(HARBOR_ROBOTACCOUNT_PASSWORD)' && (/bin/inline_scan.sh analyze -k '$(SYSDIG_SECURE_API_TOKEN)' -d '%s' -P %s || true )", req.Artifact.Digest, getImageFrom(req)),
105+
fmt.Sprintf("docker login harbor.sysdig-demo.zone -u '$(HARBOR_ROBOTACCOUNT_USER)' -p '$(HARBOR_ROBOTACCOUNT_PASSWORD)' && (/bin/inline_scan.sh analyze -s '%s' -k '$(SYSDIG_SECURE_API_TOKEN)' -d '%s' -P %s || true )", i.secureURL, req.Artifact.Digest, getImageFrom(req)),
104106
},
105107
Env: []corev1.EnvVar{
106108
{

pkg/scanner/inline_adapter_test.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import (
2525
)
2626

2727
const (
28+
secureURL = "https://secure.sysdig.com"
2829
namespace = "a-namespace"
2930
configMap = "a-configmap"
3031
secret = "a-secret"
@@ -43,7 +44,7 @@ var _ = Describe("InlineAdapter", func() {
4344
controller = gomock.NewController(GinkgoT())
4445
client = mocks.NewMockClient(controller)
4546
k8sClient = fake.NewSimpleClientset()
46-
inlineAdapter = scanner.NewInlineAdapter(client, k8sClient, namespace, configMap, secret)
47+
inlineAdapter = scanner.NewInlineAdapter(client, k8sClient, secureURL, namespace, configMap, secret)
4748
})
4849

4950
AfterEach(func() {
@@ -175,7 +176,7 @@ func job() *batchv1.Job {
175176
Command: []string{"/bin/bash"},
176177
Args: []string{
177178
"-c",
178-
"docker login harbor.sysdig-demo.zone -u '$(HARBOR_ROBOTACCOUNT_USER)' -p '$(HARBOR_ROBOTACCOUNT_PASSWORD)' && (/bin/inline_scan.sh analyze -k '$(SYSDIG_SECURE_API_TOKEN)' -d 'an image digest' -P harbor.sysdig-demo.zone/sysdig/agent:9.7.0 || true )",
179+
"docker login harbor.sysdig-demo.zone -u '$(HARBOR_ROBOTACCOUNT_USER)' -p '$(HARBOR_ROBOTACCOUNT_PASSWORD)' && (/bin/inline_scan.sh analyze -s 'https://secure.sysdig.com' -k '$(SYSDIG_SECURE_API_TOKEN)' -d 'an image digest' -P harbor.sysdig-demo.zone/sysdig/agent:9.7.0 || true )",
179180
},
180181
Env: []corev1.EnvVar{
181182
{

0 commit comments

Comments
 (0)