Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove pattern check in schema validation for cert file path #434

Merged
merged 1 commit into from
Jan 5, 2022
Merged

Remove pattern check in schema validation for cert file path #434

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- Instead of getting K8S config object now you get Config Interface using NewConfigFromEnv() and ConfigFromEnv() [cyberark/conjur-authn-k8s-client#425](https://github.com/cyberark/conjur-authn-k8s-client/pull/425)
- Instead of getting K8S authenticator object now you get Authenticator Interface using NewAuthenticator() and NewAuthenticatorWithAccessToken() [cyberark/conjur-authn-k8s-client#425](https://github.com/cyberark/conjur-authn-k8s-client/pull/425)

### Fixed
- Allows the Conjur certificate path in the conjur-config-cluster-prep Helm chart to be set to
any user specified directory. [cyberark/conjur-authn-k8s-client#434](https://github.com/cyberark/conjur-authn-k8s-client/pull/434)

## [0.22.0] - 2021-09-17
### Added
- Introduces the `conjur-config-cluster-prep.yaml` and `conjur-config-namespace-prep.yaml` raw Kubernetes manifests generated from their corresponding Helm charts. These manifests provide an alternative method of configuring a Kubernetes cluster for the deployment of Conjur-authenticated applications for users unable to use Helm in their environment.
Expand Down
2 changes: 1 addition & 1 deletion bin/test-workflow/0_prep_env.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ set -o pipefail

### PLATFORM DETAILS
export CONJUR_OSS_HELM_INSTALLED="${CONJUR_OSS_HELM_INSTALLED:-true}"
export UNIQUE_TEST_ID="$(uuidgen | tr "[:upper:]" "[:lower:]" | head -c 10)"
export UNIQUE_TEST_ID="${UNIQUE_TEST_ID:-$(uuidgen | tr "[:upper:]" "[:lower:]" | head -c 10)}"

# PLATFORM is used to differentiate between general Kubernetes platforms (kubernetes, openshift), while
# CONJUR_PLATFORM is used to differentiate between sub-platforms (kind, gke, jenkins, openshift) for the Conjur deployment
Expand Down
8 changes: 4 additions & 4 deletions helm/conjur-config-cluster-prep/test-schema
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,12 +97,12 @@ function main() {
cert_file_test "files/conjur-cert.pem"
update_results "$?"

announce "Conjur cert file beginning with 'tests/' is accepted"
cert_file_test "tests/test-cert.pem"
announce "Conjur cert file beginning with 'foo/' is accepted"
cert_file_test "foo/foobar.pem"
update_results "$?"

announce "Conjur cert file beginning with 'foo/' is rejected"
cert_file_test "foo/foobar.pem"
announce "Empty Conjur cert file is rejected"
cert_file_test ""
update_results "$?" "$EXPECT_FAILURE"

announce "Base64-encoded Conjur cert with all valid characters is accepted"
Expand Down
3 changes: 1 addition & 2 deletions helm/conjur-config-cluster-prep/values.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@
},
"certificateFilePath": {
"type": "string",
"minLength": 1,
"pattern": "(^files\/(.*))|(^tests\/(.*))"
"minLength": 1
},
"certificateBase64": {
"type": "string",
Expand Down