diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml index b970ae5dc..f21cd9759 100644 --- a/.github/workflows/scorecard.yml +++ b/.github/workflows/scorecard.yml @@ -12,7 +12,7 @@ on: schedule: - cron: '41 15 * * 4' push: - branches: [ "devel" ] + branches: ["devel"] # Declare default permissions as read only. permissions: read-all @@ -32,12 +32,12 @@ jobs: steps: - name: "Checkout code" - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 with: persist-credentials: false - name: "Run analysis" - uses: ossf/scorecard-action@62b2cac7ed8198b15735ed49ab1e5cf35480ba46 # v2.4.0 + uses: ossf/scorecard-action@62b2cac7ed8198b15735ed49ab1e5cf35480ba46 # v2.4.0 with: results_file: results.sarif results_format: sarif @@ -59,7 +59,7 @@ jobs: # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF # format to the repository Actions tab. - name: "Upload artifact" - uses: actions/upload-artifact@184d73b71b93c222403b2e7f1ffebe4508014249 # v4.4.2 + uses: actions/upload-artifact@184d73b71b93c222403b2e7f1ffebe4508014249 # v4.4.2 with: name: SARIF file path: results.sarif diff --git a/.github/workflows/test-reporting.yml b/.github/workflows/test-reporting.yml index 86bb153c7..9bb3b562b 100644 --- a/.github/workflows/test-reporting.yml +++ b/.github/workflows/test-reporting.yml @@ -53,11 +53,11 @@ jobs: && github.repository == 'ansible/receptor' && github.ref_name == github.event.repository.default_branch run: >- - curl -v --user "${{ vars.PDE_ORG_RESULTS_AGGREGATOR_UPLOAD_USER }}:${{ secrets.PDE_ORG_RESULTS_UPLOAD_PASSWORD }}" - --form "xunit_xml=@report.xml" - --form "component_name=receptor" - --form "git_commit_sha=${{ github.sha }}" - --form "git_repository_url=https://github.com/${{ github.repository }}" + curl -v --user "${{ vars.PDE_ORG_RESULTS_AGGREGATOR_UPLOAD_USER }}:${{ secrets.PDE_ORG_RESULTS_UPLOAD_PASSWORD }}" + --form "xunit_xml=@report.xml" + --form "component_name=receptor" + --form "git_commit_sha=${{ github.sha }}" + --form "git_repository_url=https://github.com/${{ github.repository }}" "${{ vars.PDE_ORG_RESULTS_AGGREGATOR_UPLOAD_URL }}/api/results/upload/" - name: get k8s logs diff --git a/docs/source/user_guide/configuration_options.rst b/docs/source/user_guide/configuration_options.rst index b0eab33da..74f6c2e06 100644 --- a/docs/source/user_guide/configuration_options.rst +++ b/docs/source/user_guide/configuration_options.rst @@ -1071,4 +1071,3 @@ Sign Request and Produce Certificate tcp-clients: - address: localhost:2223 service: foo - diff --git a/pkg/backends/null_test.go b/pkg/backends/null_test.go index 1f32a9ccd..881204e71 100644 --- a/pkg/backends/null_test.go +++ b/pkg/backends/null_test.go @@ -1,8 +1,10 @@ package backends_test import ( + "context" "crypto/tls" "reflect" + "sync" "testing" "github.com/ansible/receptor/pkg/backends" @@ -37,6 +39,62 @@ func TestNullBackendCfgGetAddr(t *testing.T) { } } +func TestNullBackendCfg_Start(t *testing.T) { + type fields struct { + Local bool + } + type args struct { + in0 context.Context + in1 *sync.WaitGroup + } + tests := []struct { + name string + fields fields + args args + wantKind reflect.Kind + wantType string + wantErr bool + }{ + { + name: "Positive", + fields: fields{ + Local: true, + }, + args: args{ + in0: nil, + in1: nil, + }, + wantKind: reflect.Chan, + wantType: "netceptor.BackendSession", + wantErr: false, + }, + } + + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + cfg := backends.NullBackendCfg{ + Local: tt.fields.Local, + } + got, err := cfg.Start(tt.args.in0, tt.args.in1) + defer close(got) + + if (err != nil) != tt.wantErr { + t.Errorf("%s: NullBackendCfg.Start() error = %+v, wantErr %+v", tt.name, err, tt.wantErr) + + return + } + + if reflect.ValueOf(got).Kind() == tt.wantKind { + if reflect.ValueOf(got).Type().Elem().String() != tt.wantType { + t.Errorf("%s: NullBackendCfg.Start() gotType = %+v, wantType = %+v", tt.name, reflect.ValueOf(got).Type().Elem(), tt.wantType) + } + } else { + t.Errorf("%s: NullBackendCfg.Start() gotKind = %+v, wantKind = %+v", tt.name, reflect.ValueOf(got).Kind(), tt.wantKind) + } + }) + } +} + func TestNullBackendCfgGetTLS(t *testing.T) { type fields struct { Local bool