Skip to content

Commit

Permalink
Merge pull request #206 from cyberark/release-5.2.0
Browse files Browse the repository at this point in the history
Bump version to 5.2.0
  • Loading branch information
jtuttle committed Sep 13, 2021
2 parents 9e18102 + 33ff6c8 commit 40f2f1a
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 9 deletions.
9 changes: 6 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).

## [Unreleased]

## [5.2.0] - 2021-09-08
### Added
- New JWT authenticator endpoints have been added to the spec.
[cyberark/conjur-openapi-spec#193](https://github.com/cyberark/conjur-openapi-spec/pull/193)
Expand Down Expand Up @@ -37,9 +39,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
without specifying a valid `Accept-Encoding` header.
[cyberark/conjur-openapi-spec#186](https://github.com/cyberark/conjur-openapi-spec/pull/186)

## [5.1.0] - 2021-04-12
## 5.1.0 - 2021-04-12
### Added
- Example use case of spec-generated Ruby client.
- Example use case of spec-generated Ruby client.
[cyberark/conjur-openapi-spec#12](https://github.com/cyberark/conjur-openapi-spec/issues/12)
- The `/whoami` endpoint is now included in the spec. Allows for requesting info about the current client.
[cyberark/conjur-openapi-spec#56](https://github.com/cyberark/conjur-openapi-spec/issues/56)
Expand Down Expand Up @@ -102,5 +104,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- Updated naming and added support for environment variables in generated Ruby client.
[cyberark/conjur-openapi-spec#91](https://github.com/cyberark/conjur-openapi-spec/issues/91)

[Unreleased]: https://github.com/cyberark/conjur-openapi-spec/compare/v5.1.1...HEAD
[Unreleased]: https://github.com/cyberark/conjur-openapi-spec/compare/v5.2.0...HEAD
[5.2.0]: https://github.com/cyberark/conjur-openapi-spec/compare/v5.1.1...v5.2.0
[5.1.1]: https://github.com/cyberark/conjur-openapi-spec/compare/v5.1.0...v5.1.1
4 changes: 3 additions & 1 deletion spec/authentication.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ components:
minLength: 55
description: "Example of a Conjur API key"
example: "14m9cf91wfsesv1kkhevg12cdywm2wvqy6s8sk53z1ngtazp1t9tykc"

Authenticators:
type: string
enum:
Expand Down Expand Up @@ -744,6 +744,8 @@ components:
$ref: 'openapi.yml#/components/responses/BadRequest'
"401":
$ref: 'openapi.yml#/components/responses/UnauthorizedError'
"404":
$ref: 'openapi.yml#/components/responses/ResourceNotFound'

security: []

Expand Down
2 changes: 1 addition & 1 deletion spec/openapi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ openapi: "3.0.0"

info:
description: "This is an API definition for CyberArk Conjur Open Source. You can find out more at [Conjur.org](https://www.conjur.org/)."
version: 5.1.1
version: 5.2.0
title: "Conjur"
contact:
email: "conj_maintainers@cyberark.com"
Expand Down
7 changes: 4 additions & 3 deletions test/python/api_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,14 @@

def get_webservice_policy():
"""Gets the text for the webservice testing policy"""
with open(WEBSERVICE_POLICY, 'r') as policy:
with open(WEBSERVICE_POLICY, 'r', encoding="utf-8") as policy:
return policy.read()


def get_default_policy():
"""Gets the default testing policy"""
with open(pathlib.Path('.').resolve() / 'test/config/policy.yaml', 'r') as default_policy:
with open(pathlib.Path('.').resolve() / 'test/config/policy.yaml',
'r', encoding="utf-8") as default_policy:
return default_policy.read()

def get_bad_auth_api_config(username='admin'):
Expand Down Expand Up @@ -93,7 +94,7 @@ def setup_oidc_webservice():
client = get_api_client()
account = os.environ[CONJUR_ACCOUNT]
policy_api = conjur.api.PoliciesApi(client)
with open(OIDC_POLICY_FILE, 'r') as policy_file:
with open(OIDC_POLICY_FILE, 'r', encoding="utf-8") as policy_file:
policy = policy_file.read()
policy_api.update_policy(account, 'root', policy)

Expand Down
2 changes: 1 addition & 1 deletion test/python/test_certificate_authority_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

def read_file(path):
"""Returns the entirety of a file's contents"""
with open(path, 'r') as content:
with open(path, 'r', encoding="utf-8") as content:
return content.read()

class TestCertificateAuthorityApi(api_config.ConfiguredTest):
Expand Down

0 comments on commit 40f2f1a

Please sign in to comment.