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

Jump to bottom

Fixes #114 adds /api to appliance url #115

Merged
merged 3 commits into from
Nov 30, 2022
Merged

Fixes #114 adds /api to appliance url #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b567475
Fixes #114 adds `/api` to appliance url
infamousjoeg Nov 30, 2022
36fefcb
Add details to CHANGELOG for v0.6.5
infamousjoeg Nov 30, 2022
55c09f9
Bump version to v0.6.5
infamousjoeg Nov 30, 2022
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 @@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

## [Unreleased]

## [0.6.5] - 2022-11-30
### Changed
- Added support for Conjur Cloud by appending `appliance_url` with `/api` [cyberark/terraform-provider-conjur#115](https://github.com/cyberark/terraform-provider-conjur/pull/115)

## [0.6.4] - 2022-11-14
### Security
- Added replaces for 2 versions of golang.org/x/crypto brought in by the terraform sdk to resolve CVE-2021-43565
Expand Down
2 changes: 1 addition & 1 deletion VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.6.4
0.6.5
3 changes: 3 additions & 0 deletions conjur/provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,9 @@ func providerConfig(d *schema.ResourceData) (interface{}, error) {
if appliance_url != "" {
config.ApplianceURL = appliance_url
}

// Add `/api` to appliance url for Conjur Cloud support
appliance_url += "/api"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Huh, adding /api doesn't mess up a request to self-hosted?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, self-hosted supports with or without /api since v5 was released. I've made this change to numerous integrations to include Conjur Cloud support.


account := d.Get("account").(string)
if account != "" {
Expand Down