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.

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

Fixes #114 adds /api to appliance url #115

Merged
merged 3 commits into from
Nov 30, 2022
Merged

Conversation

infamousjoeg
Copy link
Member

@infamousjoeg infamousjoeg commented Nov 30, 2022

Desired Outcome

Removes the requirement to add /api to the end of appliance urls for Conjur Cloud support.

Implemented Changes

Describe how the desired outcome above has been achieved with this PR. In
particular, consider:

  • What's changed? Why were these changes made?
    Added an additional line of code to append /api to the appliance_url variable.
  • How should the reviewer approach this PR, especially if manual tests are required?
    Test, deploy, it will work successfully in all cases.
  • Are there relevant screenshots you can add to the PR description?
    No.

Connected Issue/Story

Resolves #114

CyberArk internal issue ID: n/a

Definition of Done

At least 1 todo must be completed in the sections below for the PR to be
merged.

Changelog

  • The CHANGELOG has been updated, or
  • This PR does not include user-facing changes and doesn't require a
    CHANGELOG update

Test coverage

  • This PR includes new unit and integration tests to go with the code
    changes, or
  • The changes in this PR do not require tests

Documentation

  • Docs (e.g. READMEs) were updated in this PR
  • A follow-up issue to update official docs has been filed here: [insert issue ID]
  • This PR does not require updating any documentation

Behavior

  • This PR changes product behavior and has been reviewed by a PO, or
  • These changes are part of a larger initiative that will be reviewed later, or
  • No behavior was changed with this PR

Security

  • Security architect has reviewed the changes in this PR,
  • These changes are part of a larger initiative with a separate security review, or
  • There are no security aspects to these changes

@infamousjoeg infamousjoeg requested a review from a team as a code owner November 30, 2022 16:54
@infamousjoeg infamousjoeg self-assigned this Nov 30, 2022
@infamousjoeg infamousjoeg linked an issue Nov 30, 2022 that may be closed by this pull request
3 tasks
@@ -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.

Copy link
Member

@jtuttle jtuttle left a comment

Choose a reason for hiding this comment

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

Okay, mind putting something in the CHANGELOG?

@infamousjoeg
Copy link
Member Author

@jtuttle,

Added changes to CHANGELOG, bumped VERSION to v0.6.5, updated initial comment in PR #115 (above) to reflect changes to CHANGELOG made.

@jtuttle jtuttle merged commit 2c5f31c into main Nov 30, 2022
@jtuttle jtuttle deleted the 114-add-support-for-conjur-cloud branch November 30, 2022 18:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

Add support for Conjur Cloud
2 participants