diff --git a/.github/workflows/integration.yaml b/.github/workflows/integration.yaml index af820d1422a..e3deb8fe4c4 100644 --- a/.github/workflows/integration.yaml +++ b/.github/workflows/integration.yaml @@ -98,7 +98,7 @@ jobs: ## If no one connects after 5 minutes, shut down server. wait-timeout-minutes: 5 - name: Generate coverage report - run: go tool covdata textfmt -i $GOCOVERDIR -o ${{ matrix.itest }}.out + run: sudo -E env "PATH=$PATH" go tool covdata textfmt -i $GOCOVERDIR -o ${{ matrix.itest }}.out - name: Upload Results To Codecov uses: codecov/codecov-action@v5 with: diff --git a/pkg/server/handlers/secrets-encrypt.go b/pkg/server/handlers/secrets-encrypt.go index 59cc55a185f..48d17521dba 100644 --- a/pkg/server/handlers/secrets-encrypt.go +++ b/pkg/server/handlers/secrets-encrypt.go @@ -88,9 +88,8 @@ func encryptionStatus(control *config.Control) (EncryptionState, error) { } if providers[len(providers)-1].Identity != nil && (providers[0].AESCBC != nil || providers[0].Secretbox != nil) { state.Enable = ptr.To(true) - } else if control.EncryptSecrets && providers[0].Identity != nil && len(providers) == 1 { - state.Enable = ptr.To(false) - } else if !control.EncryptSecrets || providers[0].Identity != nil && (providers[1].AESCBC != nil || providers[1].Secretbox != nil) { + } else if (control.EncryptSecrets && providers[0].Identity != nil && len(providers) == 1) || + (!control.EncryptSecrets || providers[0].Identity != nil && (providers[1].AESCBC != nil || providers[1].Secretbox != nil)) { state.Enable = ptr.To(false) }