Skip to content

Commit

Permalink
Merge pull request #115 from cyberark/114-add-support-for-conjur-cloud
Browse files Browse the repository at this point in the history
Fixes #114 adds `/api` to appliance url
  • Loading branch information
jtuttle authored Nov 30, 2022
2 parents 7a9604e + 55c09f9 commit 2c5f31c
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 1 deletion.
4 changes: 4 additions & 0 deletions CHANGELOG.md
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
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
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"

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

0 comments on commit 2c5f31c

Please sign in to comment.