Skip to content

Commit

Permalink
chore: Fix code formatting (#456)
Browse files Browse the repository at this point in the history 
Signed-off-by: Daniel Pacak <pacak.daniel@gmail.com>
  • Loading branch information
@danielpacak
danielpacak committed Mar 24, 2021
1 parent c836618 commit d57c119
Show file tree
Hide file tree
Showing 5 changed files with 129 additions and 131 deletions.
9 changes: 5 additions & 4 deletions CONTRIBUTING.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,13 +138,14 @@ To open the test coverage report in your web browser, run:
$ go tool cover -html=itest/starboard/coverage.txt
```

To run the integration tests for Starboard Operator and view the coverage report, first do the [prerequisite steps](https://github.com/aquasecurity/starboard/blob/main/CONTRIBUTING.md#prerequisites), and then run:
To run the integration tests for Starboard Operator and view the coverage report, first do the
[prerequisite steps](#prerequisites), and then run:

```
$ OPERATOR_NAMESPACE=starboard-operator \
OPERATOR_TARGET_NAMESPACES=default \
OPERATOR_LOG_DEV_MODE=true \
make itests-starboard-operator
OPERATOR_TARGET_NAMESPACES=default \
OPERATOR_LOG_DEV_MODE=true \
make itests-starboard-operator
$ go tool cover -html=itest/starboard-operator/coverage.txt
```

Expand Down
3 changes: 0 additions & 3 deletions deploy/helm/templates/configmap.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,3 @@ data:
polaris.imageRef: "{{ .Values.polaris.imageRef }}"
polaris.config.yaml: |
{{- toYaml .Values.polaris.config | nindent 4 }}
8 changes: 4 additions & 4 deletions deploy/helm/values.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,10 @@ trivy:
enabled: true
imageRef: docker.io/aquasec/trivy:0.16.0
mode: Standalone
serverURL:
httpProxy:
httpsProxy:
noProxy:
serverURL:
httpProxy:
httpsProxy:
noProxy:
severity: UNKNOWN,LOW,MEDIUM,HIGH,CRITICAL

kubeBench:
Expand Down
168 changes: 84 additions & 84 deletions pkg/plugin/trivy/plugin.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,30 +134,30 @@ func (s *scanner) getPodSpecForStandaloneMode(spec corev1.PodSpec, credentials m
},
},
},
{
Name: "HTTPS_PROXY",
ValueFrom: &corev1.EnvVarSource{
ConfigMapKeyRef: &corev1.ConfigMapKeySelector{
LocalObjectReference: corev1.LocalObjectReference{
Name: starboard.ConfigMapName,
},
Key: "trivy.httpsProxy",
Optional: pointer.BoolPtr(true),
},
},
},
{
Name: "NO_PROXY",
ValueFrom: &corev1.EnvVarSource{
ConfigMapKeyRef: &corev1.ConfigMapKeySelector{
LocalObjectReference: corev1.LocalObjectReference{
Name: starboard.ConfigMapName,
},
Key: "trivy.noProxy",
Optional: pointer.BoolPtr(true),
},
},
},
{
Name: "HTTPS_PROXY",
ValueFrom: &corev1.EnvVarSource{
ConfigMapKeyRef: &corev1.ConfigMapKeySelector{
LocalObjectReference: corev1.LocalObjectReference{
Name: starboard.ConfigMapName,
},
Key: "trivy.httpsProxy",
Optional: pointer.BoolPtr(true),
},
},
},
{
Name: "NO_PROXY",
ValueFrom: &corev1.EnvVarSource{
ConfigMapKeyRef: &corev1.ConfigMapKeySelector{
LocalObjectReference: corev1.LocalObjectReference{
Name: starboard.ConfigMapName,
},
Key: "trivy.noProxy",
Optional: pointer.BoolPtr(true),
},
},
},
{
Name: "GITHUB_TOKEN",
ValueFrom: &corev1.EnvVarSource{
Expand Down Expand Up @@ -218,30 +218,30 @@ func (s *scanner) getPodSpecForStandaloneMode(spec corev1.PodSpec, credentials m
},
},
},
{
Name: "HTTPS_PROXY",
ValueFrom: &corev1.EnvVarSource{
ConfigMapKeyRef: &corev1.ConfigMapKeySelector{
LocalObjectReference: corev1.LocalObjectReference{
Name: starboard.ConfigMapName,
},
Key: "trivy.httpsProxy",
Optional: pointer.BoolPtr(true),
},
},
},
{
Name: "NO_PROXY",
ValueFrom: &corev1.EnvVarSource{
ConfigMapKeyRef: &corev1.ConfigMapKeySelector{
LocalObjectReference: corev1.LocalObjectReference{
Name: starboard.ConfigMapName,
},
Key: "trivy.noProxy",
Optional: pointer.BoolPtr(true),
},
},
},
{
Name: "HTTPS_PROXY",
ValueFrom: &corev1.EnvVarSource{
ConfigMapKeyRef: &corev1.ConfigMapKeySelector{
LocalObjectReference: corev1.LocalObjectReference{
Name: starboard.ConfigMapName,
},
Key: "trivy.httpsProxy",
Optional: pointer.BoolPtr(true),
},
},
},
{
Name: "NO_PROXY",
ValueFrom: &corev1.EnvVarSource{
ConfigMapKeyRef: &corev1.ConfigMapKeySelector{
LocalObjectReference: corev1.LocalObjectReference{
Name: starboard.ConfigMapName,
},
Key: "trivy.noProxy",
Optional: pointer.BoolPtr(true),
},
},
},
}

if _, ok := credentials[c.Name]; ok && secret != nil {
Expand Down Expand Up @@ -365,42 +365,42 @@ func (s *scanner) getPodSpecForClientServerMode(spec corev1.PodSpec, credentials
for _, container := range spec.Containers {

env := []corev1.EnvVar{
{
Name: "HTTP_PROXY",
ValueFrom: &corev1.EnvVarSource{
ConfigMapKeyRef: &corev1.ConfigMapKeySelector{
LocalObjectReference: corev1.LocalObjectReference{
Name: starboard.ConfigMapName,
},
Key: "trivy.httpProxy",
Optional: pointer.BoolPtr(true),
},
},
},
{
Name: "HTTPS_PROXY",
ValueFrom: &corev1.EnvVarSource{
ConfigMapKeyRef: &corev1.ConfigMapKeySelector{
LocalObjectReference: corev1.LocalObjectReference{
Name: starboard.ConfigMapName,
},
Key: "trivy.httpsProxy",
Optional: pointer.BoolPtr(true),
},
},
},
{
Name: "NO_PROXY",
ValueFrom: &corev1.EnvVarSource{
ConfigMapKeyRef: &corev1.ConfigMapKeySelector{
LocalObjectReference: corev1.LocalObjectReference{
Name: starboard.ConfigMapName,
},
Key: "trivy.noProxy",
Optional: pointer.BoolPtr(true),
},
},
},
{
Name: "HTTP_PROXY",
ValueFrom: &corev1.EnvVarSource{
ConfigMapKeyRef: &corev1.ConfigMapKeySelector{
LocalObjectReference: corev1.LocalObjectReference{
Name: starboard.ConfigMapName,
},
Key: "trivy.httpProxy",
Optional: pointer.BoolPtr(true),
},
},
},
{
Name: "HTTPS_PROXY",
ValueFrom: &corev1.EnvVarSource{
ConfigMapKeyRef: &corev1.ConfigMapKeySelector{
LocalObjectReference: corev1.LocalObjectReference{
Name: starboard.ConfigMapName,
},
Key: "trivy.httpsProxy",
Optional: pointer.BoolPtr(true),
},
},
},
{
Name: "NO_PROXY",
ValueFrom: &corev1.EnvVarSource{
ConfigMapKeyRef: &corev1.ConfigMapKeySelector{
LocalObjectReference: corev1.LocalObjectReference{
Name: starboard.ConfigMapName,
},
Key: "trivy.noProxy",
Optional: pointer.BoolPtr(true),
},
},
},
{
Name: "TRIVY_SEVERITY",
ValueFrom: &corev1.EnvVarSource{
Expand Down
72 changes: 36 additions & 36 deletions pkg/plugin/trivy/plugin_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -261,42 +261,42 @@ func TestScanner_GetScanJobSpec(t *testing.T) {
ImagePullPolicy: corev1.PullIfNotPresent,
TerminationMessagePolicy: corev1.TerminationMessageFallbackToLogsOnError,
Env: []corev1.EnvVar{
{
Name: "HTTP_PROXY",
ValueFrom: &corev1.EnvVarSource{
ConfigMapKeyRef: &corev1.ConfigMapKeySelector{
LocalObjectReference: corev1.LocalObjectReference{
Name: starboard.ConfigMapName,
},
Key: "trivy.httpProxy",
Optional: pointer.BoolPtr(true),
},
},
},
{
Name: "HTTPS_PROXY",
ValueFrom: &corev1.EnvVarSource{
ConfigMapKeyRef: &corev1.ConfigMapKeySelector{
LocalObjectReference: corev1.LocalObjectReference{
Name: starboard.ConfigMapName,
},
Key: "trivy.httpsProxy",
Optional: pointer.BoolPtr(true),
},
},
},
{
Name: "NO_PROXY",
ValueFrom: &corev1.EnvVarSource{
ConfigMapKeyRef: &corev1.ConfigMapKeySelector{
LocalObjectReference: corev1.LocalObjectReference{
Name: starboard.ConfigMapName,
},
Key: "trivy.noProxy",
Optional: pointer.BoolPtr(true),
},
},
},
{
Name: "HTTP_PROXY",
ValueFrom: &corev1.EnvVarSource{
ConfigMapKeyRef: &corev1.ConfigMapKeySelector{
LocalObjectReference: corev1.LocalObjectReference{
Name: starboard.ConfigMapName,
},
Key: "trivy.httpProxy",
Optional: pointer.BoolPtr(true),
},
},
},
{
Name: "HTTPS_PROXY",
ValueFrom: &corev1.EnvVarSource{
ConfigMapKeyRef: &corev1.ConfigMapKeySelector{
LocalObjectReference: corev1.LocalObjectReference{
Name: starboard.ConfigMapName,
},
Key: "trivy.httpsProxy",
Optional: pointer.BoolPtr(true),
},
},
},
{
Name: "NO_PROXY",
ValueFrom: &corev1.EnvVarSource{
ConfigMapKeyRef: &corev1.ConfigMapKeySelector{
LocalObjectReference: corev1.LocalObjectReference{
Name: starboard.ConfigMapName,
},
Key: "trivy.noProxy",
Optional: pointer.BoolPtr(true),
},
},
},
{
Name: "TRIVY_SEVERITY",
ValueFrom: &corev1.EnvVarSource{
Expand Down

0 comments on commit d57c119

Please sign in to comment.